Cleaning.

2013-11-28 21:36:37 +01:00 · 2013-11-28 21:36:37 +01:00 · 5146cc6a3d
commit 5146cc6a3d
parent 6f91c6fadd
6 changed files with 278 additions and 67 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -19,6 +19,8 @@
 #
 # Other information:
 #   - Qt 4.7.3 and higher is required,
+#   - resource compiler (windres.exe) is needed on MinGW,
+#   - resource compiler (rc.exe) is needed on OS/2,
 #   - supports Windows, Linux, OS/2 (eComStation).
 #
 #################################################################
@ -40,11 +42,10 @@ option(USE_QT_5 "Use Qt 5 for building" ON)
 message(STATUS "[${APP_LOW_NAME}] Welcome to ${APP_NAME} compilation process.")
 message(STATUS "[${APP_LOW_NAME}] Compilation process begins right now.")

-# Enable color makefiles.
+# Setup misc options.
 set(CMAKE_COLOR_MAKEFILE ON)
-
-# Setup custom module path (not used so far).
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/resources/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_INCLUDE_CURRENT_DIR ON)

 # Setup name for executable file.
 if(APPLE)
@ -53,9 +54,6 @@ else(APPLE)
  set(EXE_NAME ${APP_LOW_NAME})
 endif(APPLE)

-# Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 # Select which Qt version to use.
 if(${USE_QT_5})
  message(STATUS "[${APP_LOW_NAME}] Using Qt 5 library for building.")
@ -80,17 +78,17 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
    string(REGEX REPLACE "\n" "" GIT_REVISION "${GIT_REVISION}")
    set(APP_REVISION ${GIT_REVISION})
  else(GIT_FOUND)
-    set(APP_REVISION UNKNOWN-REVISION)
+    set(APP_REVISION -)
  endif(GIT_FOUND)
 else(EXISTS "${PROJECT_SOURCE_DIR}/.git")
-  set(APP_REVISION SEPARATE-BUILD)
+  set(APP_REVISION -)
 endif(EXISTS "${PROJECT_SOURCE_DIR}/.git")

 message(STATUS "[${APP_LOW_NAME}] Revision number obtained: " ${APP_REVISION} ".")

 # Configure desktop entry for Linux.
 if(UNIX)
-  message(STATUS "[${APP_LOW_NAME}] Generating desktop entry.")
+  message(STATUS "[${APP_LOW_NAME}] Generating desktop entry for Linux.")
  configure_file (
    ${PROJECT_SOURCE_DIR}/resources/desktop/rssguard.desktop.in
    ${CMAKE_CURRENT_BINARY_DIR}/resources/desktop/rssguard.desktop
@ -110,7 +108,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR
  set(CMAKE_BUILD_TYPE MinSizeRel)
  message(STATUS "[${APP_LOW_NAME}] Output executable file is optimized for minimum size.")
 else(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-  message(STATUS "[${APP_LOW_NAME}] A debug build is chosen. -DDEBUG is defined.")
+  message(STATUS "[${APP_LOW_NAME}] A debug build is chosen.")
  add_definitions(-DDEBUG)
  set(CMAKE_BUILD_TYPE Debug)

@ -156,16 +154,16 @@ if(${USE_QT_5})
 endif(${USE_QT_5})

 # Setup libraries.
-
 if(${USE_QT_5})
-  find_package(Qt5Sql)
-  find_package(Qt5WebKit)
-  find_package(Qt5WebKitWidgets)
-  find_package(Qt5Widgets)
-  find_package(Qt5Xml)
-  find_package(Qt5XmlPatterns)
-  find_package(Qt5Network)
-  find_package(Qt5LinguistTools)
+  #find_package(Qt5Sql)
+  #find_package(Qt5WebKit)
+  #find_package(Qt5WebKitWidgets)
+  #find_package(Qt5Widgets)
+  #find_package(Qt5Xml)
+  #find_package(Qt5XmlPatterns)
+  #find_package(Qt5Network)
+  #find_package(Qt5LinguistTools)
+  find_package(Qt5 REQUIRED Sql WebKit WebKitWidgets Widgets Xml XmlPatterns Network LinguistTools)
 else(${USE_QT_5})
  set(QT_MIN_VERSION ${MINIMUM_QT_VERSION})
  find_package(Qt4 REQUIRED QtCore QtGui QtSql QtNetwork QtWebkit QtXml QtXmlPatterns)
@ -189,17 +187,6 @@ endif(WIN32)

 # Compile application icon if compiling with MinGW on WIN32 or with OS2.
 if(MINGW AND WIN32)
-#  set(WINDRES windres.exe)
-#  message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for Windows.")
-#  message(STATUS "[${APP_LOW_NAME}] Used tool is: ${WINDRES}")
-#  add_custom_command(
-#    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.o
-#    COMMAND ${WINDRES}  -I ${CMAKE_CURRENT_BINARY_DIR}
-#                        -i ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.rc
-#                        -o ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.o
-#    )
-#  set(APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.o)
-
  enable_language(RC)
  set(CMAKE_RC_COMPILER_INIT windres)
  message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for Windows.")
@ -343,6 +330,7 @@ set(APP_TRANSLATIONS
  localization/rssguard_cs.ts
  localization/rssguard_nl.ts
  localization/qt_cs.ts
+  localization/qt_nl.ts
 )

 set(APP_TRANSLATIONS_WO_QT
--- a/localization/qt_nl.ts
+++ b/localization/qt_nl.ts
@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="nl">
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>QT_LAYOUT_DIRECTION</source>
+        <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
+        <translation>LTR</translation>
+    </message>
+</context>
+<context>
+    <name>QDialogButtonBox</name>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Opslaan</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation>&amp;Opslaan</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Openen</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuleren</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Sluiten</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>Toepassen</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>Resetten</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Gebruikershandleiding</translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation>Niet opslaan</translation>
+    </message>
+    <message>
+        <source>Discard</source>
+        <translation>Wegdoen</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ja</translation>
+    </message>
+    <message>
+        <source>Yes to &amp;All</source>
+        <translation>Ja op &amp;alles</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation>&amp;Nee</translation>
+    </message>
+    <message>
+        <source>N&amp;o to All</source>
+        <translation>N&amp;ee op alles</translation>
+    </message>
+    <message>
+        <source>Save All</source>
+        <translation>Alles opslaan</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Retry</source>
+        <translation>Opnieuw</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Negeren</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation>Standaardwaarden herstellen</translation>
+    </message>
+    <message>
+        <source>Close without Saving</source>
+        <translation>Sluiten zonder opslaan</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+</context>
+<context>
+    <name>QErrorMessage</name>
+    <message>
+        <source>&amp;Show this message again</source>
+        <translation>&amp;Dit bericht opnieuw weergeven</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>Debug Message:</source>
+        <translation>Foutopsporingsbericht:</translation>
+    </message>
+    <message>
+        <source>Warning:</source>
+        <translation>Waarschuwing:</translation>
+    </message>
+    <message>
+        <source>Fatal Error:</source>
+        <translation>Ernstige fout:</translation>
+    </message>
+</context>
+<context>
+    <name>QInputDialog</name>
+    <message>
+        <source>Enter a value:</source>
+        <translation>Geef een waarde op:</translation>
+    </message>
+</context>
+<context>
+    <name>QMenu</name>
+    <message>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Openen</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Gebruiken</translation>
+    </message>
+</context>
+<context>
+    <name>QMenuBar</name>
+    <message>
+        <source>Actions</source>
+        <translation>Acties</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Over Qt&lt;/h3&gt;&lt;p&gt;Dit programma gebruikt Qt-versie %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation>Over Qt</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Gebruikershandleiding</translation>
+    </message>
+    <message>
+        <source>Show Details...</source>
+        <translation>Details weergeven...</translation>
+    </message>
+    <message>
+        <source>Hide Details...</source>
+        <translation>Details verbergen...</translation>
+    </message>
+</context>
+<context>
+    <name>QProgressDialog</name>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+</context>
+<context>
+    <name>QSoftKeyManager</name>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation>Selecteren</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Gereed</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opties</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation>Afsluiten</translation>
+    </message>
+</context>
+<context>
+    <name>QTextControl</name>
+    <message>
+        <source>&amp;Undo</source>
+        <translation>&amp;Ongedaan maken</translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation>&amp;Opnieuw</translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation>K&amp;nippen</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopiëren</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Link Location</source>
+        <translation>&amp;Koppelingslocatie kopiëren</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation>&amp;Plakken</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijderen</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Alles selecteren</translation>
+    </message>
+</context>
+</TS>
--- a/localization/rssguard_cs.ts
+++ b/localization/rssguard_cs.ts
@ -247,18 +247,6 @@
        <source>&amp;Messages</source>
        <translation>&amp;Zprávy</translation>
    </message>
-    <message>
-        <source>Ctrl+Shift+T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+C</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Update &amp;all</source>
        <translation>Aktualizovat &amp;vše</translation>
--- a/localization/rssguard_en.ts
+++ b/localization/rssguard_en.ts
@ -247,18 +247,6 @@
        <source>&amp;Messages</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Ctrl+Shift+T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+C</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Update &amp;all</source>
        <translation type="unfinished"></translation>
--- a/localization/rssguard_nl.ts
+++ b/localization/rssguard_nl.ts
@ -247,18 +247,6 @@
        <source>&amp;Messages</source>
        <translation>&amp;Berichten</translation>
    </message>
-    <message>
-        <source>Ctrl+Shift+T</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+O</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+C</source>
-        <translation></translation>
-    </message>
    <message>
        <source>Update &amp;all</source>
        <translation>Update &amp;alles</translation>
--- a/src/core/defs.h.in
+++ b/src/core/defs.h.in
@ -73,7 +73,7 @@
 #define MSG_MODEL_DUPDATED_INDEX    5

 #if defined(Q_OS_LINUX)
-#define APP_DESKTOP_ENTRY_PATH "@DESKTOP_ENTRY@"
+#define APP_DESKTOP_ENTRY_PATH "@DESKTOP_ENTRY_PATH@"
 #define APP_DESKTOP_ENTRY_FILE "@APP_LOW_NAME@.desktop"
 #define APP_LANG_PATH APP_PREFIX + QString("/share/rssguard/l10n")
 #define APP_SKIN_PATH APP_PREFIX + QString("/share/rssguard/skins")