From 76214fdd5e820c60a468a62fa586749102310f21 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 6 Feb 2021 23:48:43 +0000
Subject: [PATCH] Capitalise Bitmaps and Tools directories
---
source/.gitignore | 12 +++++------
.../bigimgs/aboutimage.png | Bin
.../{bitmaps => Bitmaps}/bigimgs/appicon.png | Bin
.../bigimgs/appicon48.png | Bin
.../bigimgs/appicon64.png | Bin
.../bigimgs/contactpersonicon.png | Bin
.../bigimgs/contactpersonicon48.png | Bin
.../bigimgs/contactpersonicon64.png | Bin
.../bigimgs/searchicon.png | Bin
source/{bitmaps => Bitmaps}/buttons/add.png | Bin
source/{bitmaps => Bitmaps}/buttons/minus.png | Bin
source/{bitmaps => Bitmaps}/buttons/play.png | Bin
source/{bitmaps => Bitmaps}/buttons/stop.png | Bin
.../{bitmaps => Bitmaps}/icons/accgroup.png | Bin
source/{bitmaps => Bitmaps}/icons/accinet.png | Bin
.../{bitmaps => Bitmaps}/icons/acclocal.png | Bin
source/{bitmaps => Bitmaps}/icons/accnone.png | Bin
.../icons/accunsupported.png | Bin
source/{bitmaps => Bitmaps}/icons/act1.png | Bin
source/{bitmaps => Bitmaps}/icons/act2.png | Bin
source/{bitmaps => Bitmaps}/icons/act3.png | Bin
source/{bitmaps => Bitmaps}/icons/act4.png | Bin
.../icons/activitywindow.png | Bin
.../{bitmaps => Bitmaps}/icons/actsleep.png | Bin
source/{bitmaps => Bitmaps}/icons/ciext.png | Bin
source/{bitmaps => Bitmaps}/icons/cikey.png | Bin
source/{bitmaps => Bitmaps}/icons/cilog.png | Bin
source/{bitmaps => Bitmaps}/icons/cipto.png | Bin
source/{bitmaps => Bitmaps}/icons/cisnd.png | Bin
source/{bitmaps => Bitmaps}/icons/civen.png | Bin
.../icons/hideaddressbooks.png | Bin
source/{bitmaps => Bitmaps}/icons/nossl.png | Bin
source/{bitmaps => Bitmaps}/icons/offline.png | Bin
source/{bitmaps => Bitmaps}/icons/online.png | Bin
source/{bitmaps => Bitmaps}/icons/ssl.png | Bin
.../{bitmaps => Bitmaps}/icons/sslwarning.png | Bin
.../{bitmaps => Bitmaps}/icons/windowpos.png | Bin
.../{bitmaps => Bitmaps}/misc/activity1.png | Bin
.../{bitmaps => Bitmaps}/misc/activity10.png | Bin
.../{bitmaps => Bitmaps}/misc/activity11.png | Bin
.../{bitmaps => Bitmaps}/misc/activity12.png | Bin
.../{bitmaps => Bitmaps}/misc/activity2.png | Bin
.../{bitmaps => Bitmaps}/misc/activity3.png | Bin
.../{bitmaps => Bitmaps}/misc/activity4.png | Bin
.../{bitmaps => Bitmaps}/misc/activity5.png | Bin
.../{bitmaps => Bitmaps}/misc/activity6.png | Bin
.../{bitmaps => Bitmaps}/misc/activity7.png | Bin
.../{bitmaps => Bitmaps}/misc/activity8.png | Bin
.../{bitmaps => Bitmaps}/misc/activity9.png | Bin
.../misc/activitysleep.png | Bin
.../{bitmaps => Bitmaps}/misc/emptyimage.png | Bin
.../toolbar/addaddressbook.png | Bin
.../toolbar/addcontact.png | Bin
.../toolbar/deletecontact.png | Bin
.../toolbar/editcontact.png | Bin
.../toolbar/preferences.png | Bin
.../toolbar/searchcontacts.png | Bin
source/CMakeLists.txt | 4 ++--
source/{tools => Tools}/CMakeLists.txt | 6 +++---
source/{tools => Tools}/bitmapcode.cpp | 19 +++++++++---------
source/{tools => Tools}/generateicnsfile.sh | 0
.../odthelpbrowser/ODTHelpBrowser.cpp | 0
.../odthelpbrowser/ODTHelpBrowser.h | 0
.../odthelpbrowser/base64.cpp | 0
.../{tools => Tools}/odthelpbrowser/base64.h | 0
.../odthelpbrowser/frmMain.cpp | 0
.../{tools => Tools}/odthelpbrowser/frmMain.h | 0
.../{tools => Tools}/odthelpbrowser/main.cpp | 0
.../{tools => Tools}/odthelpbrowser/odt.cpp | 0
source/{tools => Tools}/odthelpbrowser/odt.h | 0
.../{tools => Tools}/odthelpbrowser/version.h | 0
source/{tools => Tools}/updatepotfile.sh | 0
source/{tools => Tools}/updateversion.pl | 0
source/actmgr/frmActivityMgr.cpp | 2 +-
source/common/timers.h | 4 ++--
source/contacteditor/frmContactEditor.cpp | 4 ++--
source/frmAbout.cpp | 4 ++--
source/frmMain.cpp | 2 +-
source/frmMain.h | 2 +-
source/frmPreferences.cpp | 4 ++--
source/import/frmImportContacts.cpp | 4 ++--
source/main.cpp | 2 +-
source/search/XABSearchPanel.h | 2 +-
source/search/frmSearch.h | 2 +-
84 files changed, 36 insertions(+), 37 deletions(-)
rename source/{bitmaps => Bitmaps}/bigimgs/aboutimage.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/appicon.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/appicon48.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/appicon64.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/contactpersonicon.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/contactpersonicon48.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/contactpersonicon64.png (100%)
rename source/{bitmaps => Bitmaps}/bigimgs/searchicon.png (100%)
rename source/{bitmaps => Bitmaps}/buttons/add.png (100%)
rename source/{bitmaps => Bitmaps}/buttons/minus.png (100%)
rename source/{bitmaps => Bitmaps}/buttons/play.png (100%)
rename source/{bitmaps => Bitmaps}/buttons/stop.png (100%)
rename source/{bitmaps => Bitmaps}/icons/accgroup.png (100%)
rename source/{bitmaps => Bitmaps}/icons/accinet.png (100%)
rename source/{bitmaps => Bitmaps}/icons/acclocal.png (100%)
rename source/{bitmaps => Bitmaps}/icons/accnone.png (100%)
rename source/{bitmaps => Bitmaps}/icons/accunsupported.png (100%)
rename source/{bitmaps => Bitmaps}/icons/act1.png (100%)
rename source/{bitmaps => Bitmaps}/icons/act2.png (100%)
rename source/{bitmaps => Bitmaps}/icons/act3.png (100%)
rename source/{bitmaps => Bitmaps}/icons/act4.png (100%)
rename source/{bitmaps => Bitmaps}/icons/activitywindow.png (100%)
rename source/{bitmaps => Bitmaps}/icons/actsleep.png (100%)
rename source/{bitmaps => Bitmaps}/icons/ciext.png (100%)
rename source/{bitmaps => Bitmaps}/icons/cikey.png (100%)
rename source/{bitmaps => Bitmaps}/icons/cilog.png (100%)
rename source/{bitmaps => Bitmaps}/icons/cipto.png (100%)
rename source/{bitmaps => Bitmaps}/icons/cisnd.png (100%)
rename source/{bitmaps => Bitmaps}/icons/civen.png (100%)
rename source/{bitmaps => Bitmaps}/icons/hideaddressbooks.png (100%)
rename source/{bitmaps => Bitmaps}/icons/nossl.png (100%)
rename source/{bitmaps => Bitmaps}/icons/offline.png (100%)
rename source/{bitmaps => Bitmaps}/icons/online.png (100%)
rename source/{bitmaps => Bitmaps}/icons/ssl.png (100%)
rename source/{bitmaps => Bitmaps}/icons/sslwarning.png (100%)
rename source/{bitmaps => Bitmaps}/icons/windowpos.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity1.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity10.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity11.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity12.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity2.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity3.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity4.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity5.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity6.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity7.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity8.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activity9.png (100%)
rename source/{bitmaps => Bitmaps}/misc/activitysleep.png (100%)
rename source/{bitmaps => Bitmaps}/misc/emptyimage.png (100%)
rename source/{bitmaps => Bitmaps}/toolbar/addaddressbook.png (100%)
rename source/{bitmaps => Bitmaps}/toolbar/addcontact.png (100%)
rename source/{bitmaps => Bitmaps}/toolbar/deletecontact.png (100%)
rename source/{bitmaps => Bitmaps}/toolbar/editcontact.png (100%)
rename source/{bitmaps => Bitmaps}/toolbar/preferences.png (100%)
rename source/{bitmaps => Bitmaps}/toolbar/searchcontacts.png (100%)
rename source/{tools => Tools}/CMakeLists.txt (87%)
rename source/{tools => Tools}/bitmapcode.cpp (95%)
rename source/{tools => Tools}/generateicnsfile.sh (100%)
rename source/{tools => Tools}/odthelpbrowser/ODTHelpBrowser.cpp (100%)
rename source/{tools => Tools}/odthelpbrowser/ODTHelpBrowser.h (100%)
rename source/{tools => Tools}/odthelpbrowser/base64.cpp (100%)
rename source/{tools => Tools}/odthelpbrowser/base64.h (100%)
rename source/{tools => Tools}/odthelpbrowser/frmMain.cpp (100%)
rename source/{tools => Tools}/odthelpbrowser/frmMain.h (100%)
rename source/{tools => Tools}/odthelpbrowser/main.cpp (100%)
rename source/{tools => Tools}/odthelpbrowser/odt.cpp (100%)
rename source/{tools => Tools}/odthelpbrowser/odt.h (100%)
rename source/{tools => Tools}/odthelpbrowser/version.h (100%)
rename source/{tools => Tools}/updatepotfile.sh (100%)
rename source/{tools => Tools}/updateversion.pl (100%)
diff --git a/source/.gitignore b/source/.gitignore
index fa26ccc..5f7ed9a 100644
--- a/source/.gitignore
+++ b/source/.gitignore
@@ -2,13 +2,13 @@
*~
.directory
autom4te.cache/
-bitmaps/*/*.cpp
-bitmaps/*.h
-bitmaps.h
+Bitmaps/*/*.cpp
+Bitmaps/*.h
+Bitmaps.h
Makefile
-bitmapsdone
+Bitmapsdone
config.log
config.status
-tools/bitmapcode.helper
-tools/odthelpbrowser/odthelpbrowser
+Tools/bitmapcode.helper
+Tools/odthelpbrowser/odthelpbrowser
xestiaab
diff --git a/source/bitmaps/bigimgs/aboutimage.png b/source/Bitmaps/bigimgs/aboutimage.png
similarity index 100%
rename from source/bitmaps/bigimgs/aboutimage.png
rename to source/Bitmaps/bigimgs/aboutimage.png
diff --git a/source/bitmaps/bigimgs/appicon.png b/source/Bitmaps/bigimgs/appicon.png
similarity index 100%
rename from source/bitmaps/bigimgs/appicon.png
rename to source/Bitmaps/bigimgs/appicon.png
diff --git a/source/bitmaps/bigimgs/appicon48.png b/source/Bitmaps/bigimgs/appicon48.png
similarity index 100%
rename from source/bitmaps/bigimgs/appicon48.png
rename to source/Bitmaps/bigimgs/appicon48.png
diff --git a/source/bitmaps/bigimgs/appicon64.png b/source/Bitmaps/bigimgs/appicon64.png
similarity index 100%
rename from source/bitmaps/bigimgs/appicon64.png
rename to source/Bitmaps/bigimgs/appicon64.png
diff --git a/source/bitmaps/bigimgs/contactpersonicon.png b/source/Bitmaps/bigimgs/contactpersonicon.png
similarity index 100%
rename from source/bitmaps/bigimgs/contactpersonicon.png
rename to source/Bitmaps/bigimgs/contactpersonicon.png
diff --git a/source/bitmaps/bigimgs/contactpersonicon48.png b/source/Bitmaps/bigimgs/contactpersonicon48.png
similarity index 100%
rename from source/bitmaps/bigimgs/contactpersonicon48.png
rename to source/Bitmaps/bigimgs/contactpersonicon48.png
diff --git a/source/bitmaps/bigimgs/contactpersonicon64.png b/source/Bitmaps/bigimgs/contactpersonicon64.png
similarity index 100%
rename from source/bitmaps/bigimgs/contactpersonicon64.png
rename to source/Bitmaps/bigimgs/contactpersonicon64.png
diff --git a/source/bitmaps/bigimgs/searchicon.png b/source/Bitmaps/bigimgs/searchicon.png
similarity index 100%
rename from source/bitmaps/bigimgs/searchicon.png
rename to source/Bitmaps/bigimgs/searchicon.png
diff --git a/source/bitmaps/buttons/add.png b/source/Bitmaps/buttons/add.png
similarity index 100%
rename from source/bitmaps/buttons/add.png
rename to source/Bitmaps/buttons/add.png
diff --git a/source/bitmaps/buttons/minus.png b/source/Bitmaps/buttons/minus.png
similarity index 100%
rename from source/bitmaps/buttons/minus.png
rename to source/Bitmaps/buttons/minus.png
diff --git a/source/bitmaps/buttons/play.png b/source/Bitmaps/buttons/play.png
similarity index 100%
rename from source/bitmaps/buttons/play.png
rename to source/Bitmaps/buttons/play.png
diff --git a/source/bitmaps/buttons/stop.png b/source/Bitmaps/buttons/stop.png
similarity index 100%
rename from source/bitmaps/buttons/stop.png
rename to source/Bitmaps/buttons/stop.png
diff --git a/source/bitmaps/icons/accgroup.png b/source/Bitmaps/icons/accgroup.png
similarity index 100%
rename from source/bitmaps/icons/accgroup.png
rename to source/Bitmaps/icons/accgroup.png
diff --git a/source/bitmaps/icons/accinet.png b/source/Bitmaps/icons/accinet.png
similarity index 100%
rename from source/bitmaps/icons/accinet.png
rename to source/Bitmaps/icons/accinet.png
diff --git a/source/bitmaps/icons/acclocal.png b/source/Bitmaps/icons/acclocal.png
similarity index 100%
rename from source/bitmaps/icons/acclocal.png
rename to source/Bitmaps/icons/acclocal.png
diff --git a/source/bitmaps/icons/accnone.png b/source/Bitmaps/icons/accnone.png
similarity index 100%
rename from source/bitmaps/icons/accnone.png
rename to source/Bitmaps/icons/accnone.png
diff --git a/source/bitmaps/icons/accunsupported.png b/source/Bitmaps/icons/accunsupported.png
similarity index 100%
rename from source/bitmaps/icons/accunsupported.png
rename to source/Bitmaps/icons/accunsupported.png
diff --git a/source/bitmaps/icons/act1.png b/source/Bitmaps/icons/act1.png
similarity index 100%
rename from source/bitmaps/icons/act1.png
rename to source/Bitmaps/icons/act1.png
diff --git a/source/bitmaps/icons/act2.png b/source/Bitmaps/icons/act2.png
similarity index 100%
rename from source/bitmaps/icons/act2.png
rename to source/Bitmaps/icons/act2.png
diff --git a/source/bitmaps/icons/act3.png b/source/Bitmaps/icons/act3.png
similarity index 100%
rename from source/bitmaps/icons/act3.png
rename to source/Bitmaps/icons/act3.png
diff --git a/source/bitmaps/icons/act4.png b/source/Bitmaps/icons/act4.png
similarity index 100%
rename from source/bitmaps/icons/act4.png
rename to source/Bitmaps/icons/act4.png
diff --git a/source/bitmaps/icons/activitywindow.png b/source/Bitmaps/icons/activitywindow.png
similarity index 100%
rename from source/bitmaps/icons/activitywindow.png
rename to source/Bitmaps/icons/activitywindow.png
diff --git a/source/bitmaps/icons/actsleep.png b/source/Bitmaps/icons/actsleep.png
similarity index 100%
rename from source/bitmaps/icons/actsleep.png
rename to source/Bitmaps/icons/actsleep.png
diff --git a/source/bitmaps/icons/ciext.png b/source/Bitmaps/icons/ciext.png
similarity index 100%
rename from source/bitmaps/icons/ciext.png
rename to source/Bitmaps/icons/ciext.png
diff --git a/source/bitmaps/icons/cikey.png b/source/Bitmaps/icons/cikey.png
similarity index 100%
rename from source/bitmaps/icons/cikey.png
rename to source/Bitmaps/icons/cikey.png
diff --git a/source/bitmaps/icons/cilog.png b/source/Bitmaps/icons/cilog.png
similarity index 100%
rename from source/bitmaps/icons/cilog.png
rename to source/Bitmaps/icons/cilog.png
diff --git a/source/bitmaps/icons/cipto.png b/source/Bitmaps/icons/cipto.png
similarity index 100%
rename from source/bitmaps/icons/cipto.png
rename to source/Bitmaps/icons/cipto.png
diff --git a/source/bitmaps/icons/cisnd.png b/source/Bitmaps/icons/cisnd.png
similarity index 100%
rename from source/bitmaps/icons/cisnd.png
rename to source/Bitmaps/icons/cisnd.png
diff --git a/source/bitmaps/icons/civen.png b/source/Bitmaps/icons/civen.png
similarity index 100%
rename from source/bitmaps/icons/civen.png
rename to source/Bitmaps/icons/civen.png
diff --git a/source/bitmaps/icons/hideaddressbooks.png b/source/Bitmaps/icons/hideaddressbooks.png
similarity index 100%
rename from source/bitmaps/icons/hideaddressbooks.png
rename to source/Bitmaps/icons/hideaddressbooks.png
diff --git a/source/bitmaps/icons/nossl.png b/source/Bitmaps/icons/nossl.png
similarity index 100%
rename from source/bitmaps/icons/nossl.png
rename to source/Bitmaps/icons/nossl.png
diff --git a/source/bitmaps/icons/offline.png b/source/Bitmaps/icons/offline.png
similarity index 100%
rename from source/bitmaps/icons/offline.png
rename to source/Bitmaps/icons/offline.png
diff --git a/source/bitmaps/icons/online.png b/source/Bitmaps/icons/online.png
similarity index 100%
rename from source/bitmaps/icons/online.png
rename to source/Bitmaps/icons/online.png
diff --git a/source/bitmaps/icons/ssl.png b/source/Bitmaps/icons/ssl.png
similarity index 100%
rename from source/bitmaps/icons/ssl.png
rename to source/Bitmaps/icons/ssl.png
diff --git a/source/bitmaps/icons/sslwarning.png b/source/Bitmaps/icons/sslwarning.png
similarity index 100%
rename from source/bitmaps/icons/sslwarning.png
rename to source/Bitmaps/icons/sslwarning.png
diff --git a/source/bitmaps/icons/windowpos.png b/source/Bitmaps/icons/windowpos.png
similarity index 100%
rename from source/bitmaps/icons/windowpos.png
rename to source/Bitmaps/icons/windowpos.png
diff --git a/source/bitmaps/misc/activity1.png b/source/Bitmaps/misc/activity1.png
similarity index 100%
rename from source/bitmaps/misc/activity1.png
rename to source/Bitmaps/misc/activity1.png
diff --git a/source/bitmaps/misc/activity10.png b/source/Bitmaps/misc/activity10.png
similarity index 100%
rename from source/bitmaps/misc/activity10.png
rename to source/Bitmaps/misc/activity10.png
diff --git a/source/bitmaps/misc/activity11.png b/source/Bitmaps/misc/activity11.png
similarity index 100%
rename from source/bitmaps/misc/activity11.png
rename to source/Bitmaps/misc/activity11.png
diff --git a/source/bitmaps/misc/activity12.png b/source/Bitmaps/misc/activity12.png
similarity index 100%
rename from source/bitmaps/misc/activity12.png
rename to source/Bitmaps/misc/activity12.png
diff --git a/source/bitmaps/misc/activity2.png b/source/Bitmaps/misc/activity2.png
similarity index 100%
rename from source/bitmaps/misc/activity2.png
rename to source/Bitmaps/misc/activity2.png
diff --git a/source/bitmaps/misc/activity3.png b/source/Bitmaps/misc/activity3.png
similarity index 100%
rename from source/bitmaps/misc/activity3.png
rename to source/Bitmaps/misc/activity3.png
diff --git a/source/bitmaps/misc/activity4.png b/source/Bitmaps/misc/activity4.png
similarity index 100%
rename from source/bitmaps/misc/activity4.png
rename to source/Bitmaps/misc/activity4.png
diff --git a/source/bitmaps/misc/activity5.png b/source/Bitmaps/misc/activity5.png
similarity index 100%
rename from source/bitmaps/misc/activity5.png
rename to source/Bitmaps/misc/activity5.png
diff --git a/source/bitmaps/misc/activity6.png b/source/Bitmaps/misc/activity6.png
similarity index 100%
rename from source/bitmaps/misc/activity6.png
rename to source/Bitmaps/misc/activity6.png
diff --git a/source/bitmaps/misc/activity7.png b/source/Bitmaps/misc/activity7.png
similarity index 100%
rename from source/bitmaps/misc/activity7.png
rename to source/Bitmaps/misc/activity7.png
diff --git a/source/bitmaps/misc/activity8.png b/source/Bitmaps/misc/activity8.png
similarity index 100%
rename from source/bitmaps/misc/activity8.png
rename to source/Bitmaps/misc/activity8.png
diff --git a/source/bitmaps/misc/activity9.png b/source/Bitmaps/misc/activity9.png
similarity index 100%
rename from source/bitmaps/misc/activity9.png
rename to source/Bitmaps/misc/activity9.png
diff --git a/source/bitmaps/misc/activitysleep.png b/source/Bitmaps/misc/activitysleep.png
similarity index 100%
rename from source/bitmaps/misc/activitysleep.png
rename to source/Bitmaps/misc/activitysleep.png
diff --git a/source/bitmaps/misc/emptyimage.png b/source/Bitmaps/misc/emptyimage.png
similarity index 100%
rename from source/bitmaps/misc/emptyimage.png
rename to source/Bitmaps/misc/emptyimage.png
diff --git a/source/bitmaps/toolbar/addaddressbook.png b/source/Bitmaps/toolbar/addaddressbook.png
similarity index 100%
rename from source/bitmaps/toolbar/addaddressbook.png
rename to source/Bitmaps/toolbar/addaddressbook.png
diff --git a/source/bitmaps/toolbar/addcontact.png b/source/Bitmaps/toolbar/addcontact.png
similarity index 100%
rename from source/bitmaps/toolbar/addcontact.png
rename to source/Bitmaps/toolbar/addcontact.png
diff --git a/source/bitmaps/toolbar/deletecontact.png b/source/Bitmaps/toolbar/deletecontact.png
similarity index 100%
rename from source/bitmaps/toolbar/deletecontact.png
rename to source/Bitmaps/toolbar/deletecontact.png
diff --git a/source/bitmaps/toolbar/editcontact.png b/source/Bitmaps/toolbar/editcontact.png
similarity index 100%
rename from source/bitmaps/toolbar/editcontact.png
rename to source/Bitmaps/toolbar/editcontact.png
diff --git a/source/bitmaps/toolbar/preferences.png b/source/Bitmaps/toolbar/preferences.png
similarity index 100%
rename from source/bitmaps/toolbar/preferences.png
rename to source/Bitmaps/toolbar/preferences.png
diff --git a/source/bitmaps/toolbar/searchcontacts.png b/source/Bitmaps/toolbar/searchcontacts.png
similarity index 100%
rename from source/bitmaps/toolbar/searchcontacts.png
rename to source/Bitmaps/toolbar/searchcontacts.png
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 814b433..b919005 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -18,7 +18,7 @@ if (XestiaAddressBook_UNIT_TESTING)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/UnitTestOutput)
endif()
-add_subdirectory(tools)
+add_subdirectory(Tools)
add_subdirectory(actmgr)
#add_subdirectory(bitmaps)
add_subdirectory(carddav2)
@@ -31,4 +31,4 @@ add_subdirectory(vcard)
add_subdirectory(widgets)
include(Application)
-include(UnitTestPreprocessorMacros)
\ No newline at end of file
+include(UnitTestPreprocessorMacros)
diff --git a/source/tools/CMakeLists.txt b/source/Tools/CMakeLists.txt
similarity index 87%
rename from source/tools/CMakeLists.txt
rename to source/Tools/CMakeLists.txt
index 7a05fce..a20c62e 100644
--- a/source/tools/CMakeLists.txt
+++ b/source/Tools/CMakeLists.txt
@@ -8,7 +8,7 @@ if (MSVC)
add_custom_command(
TARGET bitmapcode
POST_BUILD
- COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+ COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/Bitmaps)
elseif (APPLE)
target_link_libraries(bitmapcode
LINK_PUBLIC
@@ -17,7 +17,7 @@ elseif (APPLE)
add_custom_command(
TARGET bitmapcode
POST_BUILD
- COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+ COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/Bitmaps)
else()
target_link_libraries(bitmapcode
LINK_PUBLIC
@@ -25,7 +25,7 @@ else()
add_custom_command(
TARGET bitmapcode
POST_BUILD
- COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+ COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/Bitmaps)
endif()
set (sources
diff --git a/source/tools/bitmapcode.cpp b/source/Tools/bitmapcode.cpp
similarity index 95%
rename from source/tools/bitmapcode.cpp
rename to source/Tools/bitmapcode.cpp
index 4425062..09cfed0 100644
--- a/source/tools/bitmapcode.cpp
+++ b/source/Tools/bitmapcode.cpp
@@ -1,6 +1,6 @@
// bitmapcode.cpp - Bitmap code helper.
//
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2021 Xestia Software Development.
//
// This file is part of Xestia Address Book.
//
@@ -286,11 +286,10 @@ int main(int argc, char *argv[])
// Check if completed file exists before doing anything
// else and write an error message if it does exist.
- if (wxFileExists(wxT("bitmapsdone"))){
+ if (wxFileExists(wxT("BitmapsDone"))){
std::cout << "Bitmap files have already been generated!" << std::endl << std::endl;
- std::cout << "To regenerate the files simply delete the bitmapsdone file where this helper application is run." << std::endl;
-
+ std::cout << "To regenerate the files simply delete the BitmapsDone file where this helper application is run." << std::endl;
return 0;
@@ -318,12 +317,12 @@ int main(int argc, char *argv[])
#elif defined(__WIN32__)
BitmapHeaderFilename.Append(BitmapDirName);
- BitmapHeaderFilename.Append(wxT("\\..\\bitmaps.h"));
+ BitmapHeaderFilename.Append(wxT("\\..\\Bitmaps.h"));
#else
BitmapHeaderFilename.Append(BitmapDirName);
- BitmapHeaderFilename.Append(wxT("/../bitmaps.h"));
+ BitmapHeaderFilename.Append(wxT("/../Bitmaps.h"));
#endif
@@ -486,12 +485,12 @@ int main(int argc, char *argv[])
#elif defined(__WIN32__)
- finalhppfile << "#include \"bitmaps\\" << DirNameSplit.ToStdString() <<
+ finalhppfile << "#include \"Bitmaps\\" << DirNameSplit.ToStdString() <<
".h\"" << endl;
#else
- finalhppfile << "#include \"bitmaps/" << DirNameSplit.ToStdString() <<
+ finalhppfile << "#include \"Bitmaps/" << DirNameSplit.ToStdString() <<
".h\"" << endl;
#endif
@@ -514,8 +513,8 @@ int main(int argc, char *argv[])
fstream bitmapflag;
- bitmapflag.open("bitmapsdone", ios::out | ios::trunc);
- bitmapflag << "Bitmaps as code generated. To recreate, simply delete this file and run the bitmap code generation tool again." << endl;
+ bitmapflag.open("BitmapsDone", ios::out | ios::trunc);
+ bitmapflag << "Bitmaps as code generated. To recreate, simply delete the BitmapsDone file and run the bitmap code generation tool again." << endl;
bitmapflag.close();
return 0;
diff --git a/source/tools/generateicnsfile.sh b/source/Tools/generateicnsfile.sh
similarity index 100%
rename from source/tools/generateicnsfile.sh
rename to source/Tools/generateicnsfile.sh
diff --git a/source/tools/odthelpbrowser/ODTHelpBrowser.cpp b/source/Tools/odthelpbrowser/ODTHelpBrowser.cpp
similarity index 100%
rename from source/tools/odthelpbrowser/ODTHelpBrowser.cpp
rename to source/Tools/odthelpbrowser/ODTHelpBrowser.cpp
diff --git a/source/tools/odthelpbrowser/ODTHelpBrowser.h b/source/Tools/odthelpbrowser/ODTHelpBrowser.h
similarity index 100%
rename from source/tools/odthelpbrowser/ODTHelpBrowser.h
rename to source/Tools/odthelpbrowser/ODTHelpBrowser.h
diff --git a/source/tools/odthelpbrowser/base64.cpp b/source/Tools/odthelpbrowser/base64.cpp
similarity index 100%
rename from source/tools/odthelpbrowser/base64.cpp
rename to source/Tools/odthelpbrowser/base64.cpp
diff --git a/source/tools/odthelpbrowser/base64.h b/source/Tools/odthelpbrowser/base64.h
similarity index 100%
rename from source/tools/odthelpbrowser/base64.h
rename to source/Tools/odthelpbrowser/base64.h
diff --git a/source/tools/odthelpbrowser/frmMain.cpp b/source/Tools/odthelpbrowser/frmMain.cpp
similarity index 100%
rename from source/tools/odthelpbrowser/frmMain.cpp
rename to source/Tools/odthelpbrowser/frmMain.cpp
diff --git a/source/tools/odthelpbrowser/frmMain.h b/source/Tools/odthelpbrowser/frmMain.h
similarity index 100%
rename from source/tools/odthelpbrowser/frmMain.h
rename to source/Tools/odthelpbrowser/frmMain.h
diff --git a/source/tools/odthelpbrowser/main.cpp b/source/Tools/odthelpbrowser/main.cpp
similarity index 100%
rename from source/tools/odthelpbrowser/main.cpp
rename to source/Tools/odthelpbrowser/main.cpp
diff --git a/source/tools/odthelpbrowser/odt.cpp b/source/Tools/odthelpbrowser/odt.cpp
similarity index 100%
rename from source/tools/odthelpbrowser/odt.cpp
rename to source/Tools/odthelpbrowser/odt.cpp
diff --git a/source/tools/odthelpbrowser/odt.h b/source/Tools/odthelpbrowser/odt.h
similarity index 100%
rename from source/tools/odthelpbrowser/odt.h
rename to source/Tools/odthelpbrowser/odt.h
diff --git a/source/tools/odthelpbrowser/version.h b/source/Tools/odthelpbrowser/version.h
similarity index 100%
rename from source/tools/odthelpbrowser/version.h
rename to source/Tools/odthelpbrowser/version.h
diff --git a/source/tools/updatepotfile.sh b/source/Tools/updatepotfile.sh
similarity index 100%
rename from source/tools/updatepotfile.sh
rename to source/Tools/updatepotfile.sh
diff --git a/source/tools/updateversion.pl b/source/Tools/updateversion.pl
similarity index 100%
rename from source/tools/updateversion.pl
rename to source/Tools/updateversion.pl
diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index be5f40a..ac41664 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -27,7 +27,7 @@
#include <list>
#include <curl/curl.h>
-#include "../bitmaps.h"
+#include "../Bitmaps.h"
#include "../enums.h"
#include "../common/preferences.h"
#include "../frmConflictResolution.h"
diff --git a/source/common/timers.h b/source/common/timers.h
index 10ce0e6..8859e48 100644
--- a/source/common/timers.h
+++ b/source/common/timers.h
@@ -32,7 +32,7 @@
#include "../connobject/ConnectionObject.h"
#include "../frmContact.h"
#include "../frmMain.h"
-#include "../bitmaps.h"
+#include "../Bitmaps.h"
#include "../enums.h"
#include "../common/preferences.h"
#include "../common/etag.h"
@@ -184,4 +184,4 @@ public:
void SleepFor(unsigned long longSleepNanoSecs);
-#endif
\ No newline at end of file
+#endif
diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index ad16901..4d7bde2 100644
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -58,7 +58,7 @@
#include "../version.h"
#include "../vcard/vcard.h"
#include "../vcard/vcard34conv.h"
-#include "../bitmaps.h"
+#include "../Bitmaps.h"
#include "../common/base64.h"
#include "../common/textprocessing.h"
#include "../common/preferences.h"
@@ -655,4 +655,4 @@ void frmContactEditor::SetMode(bool StartupEditModeIn){
StartupEditMode = StartupEditModeIn;
-}
\ No newline at end of file
+}
diff --git a/source/frmAbout.cpp b/source/frmAbout.cpp
index f23e35a..aa08e60 100644
--- a/source/frmAbout.cpp
+++ b/source/frmAbout.cpp
@@ -23,7 +23,7 @@
#include "frmAbout.h"
#include "version.h"
-#include "bitmaps.h"
+#include "Bitmaps.h"
frmAbout::frmAbout( wxWindow* parent )
:
@@ -68,4 +68,4 @@ void frmAbout::SetupAboutWindow()
lblCompileTime->SetLabel(BuildLabel);
lblCopyright->SetLabel(CopyrightLabel);
-}
\ No newline at end of file
+}
diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index f09456c..f07a5ca 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -48,7 +48,7 @@
#include "frmSSLCertificate.h"
#include "frmUpdate.h"
#include "import/frmImportResults.h"
-#include "bitmaps.h"
+#include "Bitmaps.h"
#include "common/preferences.h"
#include "common/getcontactinfo.h"
diff --git a/source/frmMain.h b/source/frmMain.h
index 4a2313c..2e7613f 100644
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -48,7 +48,7 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
#include "common/events.h"
#include "common/etag.h"
#include "common/structs.h"
-#include "bitmaps.h"
+#include "Bitmaps.h"
#include "common/sslcertstructs.h"
#include "widgets/XABContactMenu.h"
#include "widgets/XABAccountView.h"
diff --git a/source/frmPreferences.cpp b/source/frmPreferences.cpp
index 965bc2b..e8e3754 100644
--- a/source/frmPreferences.cpp
+++ b/source/frmPreferences.cpp
@@ -22,7 +22,7 @@
#include "frmMain.h"
#include "common/preferences.h"
#include "common/dirs.h"
-#include "bitmaps.h"
+#include "Bitmaps.h"
#include "import/import.h"
#include "export/export.h"
@@ -523,4 +523,4 @@ void frmPreferences::CloseWindow(wxCommandEvent &event){
this->Close();
-}
\ No newline at end of file
+}
diff --git a/source/import/frmImportContacts.cpp b/source/import/frmImportContacts.cpp
index ff0341c..e6d4a01 100644
--- a/source/import/frmImportContacts.cpp
+++ b/source/import/frmImportContacts.cpp
@@ -22,7 +22,7 @@
#include "frmImportContacts.h"
#include "import-struct.h"
#include "../common/preferences.h"
-#include "../bitmaps.h"
+#include "../Bitmaps.h"
#include "../vcard/vcard.h"
#include "../common/dirs.h"
@@ -310,4 +310,4 @@ bool frmImportContacts::GetDialogResult(){
return DialogResult;
-}
\ No newline at end of file
+}
diff --git a/source/main.cpp b/source/main.cpp
index 2140dfd..a1d8945 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -30,7 +30,7 @@
#include "frmMain.h"
#include "frmContact.h"
#include "vcard/vcard.h"
-#include "bitmaps.h"
+#include "Bitmaps.h"
#include "version.h"
#include "convert.h"
#include "actmgr/frmActivityMgr.h"
diff --git a/source/search/XABSearchPanel.h b/source/search/XABSearchPanel.h
index a21ef87..bf6957d 100644
--- a/source/search/XABSearchPanel.h
+++ b/source/search/XABSearchPanel.h
@@ -30,7 +30,7 @@ Subclass of XABSearchPanelADT, which is generated by wxFormBuilder.
#include "../common/preferences.h"
#include "frmSearch.h"
-#include "../bitmaps.h"
+#include "../Bitmaps.h"
//// end generated include
diff --git a/source/search/frmSearch.h b/source/search/frmSearch.h
index eab1645..8457e46 100644
--- a/source/search/frmSearch.h
+++ b/source/search/frmSearch.h
@@ -28,7 +28,7 @@ Subclass of frmSearchADT, which is generated by wxFormBuilder.
#include "../vcard/vcard.h"
#include "../widgets/XABContactMenu.h"
#include "XABSearchPanel.h"
-#include "../bitmaps.h"
+#include "../Bitmaps.h"
#include "../frmMain.h"
#include "../frmContact.h"
--
2.39.5