Changeset 364:32145f6c3e53 in SMSSender


Ignore:
Timestamp:
Apr 2, 2014 8:05:04 PM (5 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
separation-frontend-backend
Message:
  • Changes version to 3.1
  • Removes static -base libraries and instead merges them into the frontend projects. This is done in a way that they are still shared between the different frontends. However, the sources need to be recompiled for each frontend to ensure compatibility. The benefit is, that from now on, multiple frontends can be compiled at the same time with only one configuration. In particular, DEFINES+=FRONTEND_xxx changed to CONFIG+=build-frontend-xxx.
  • Creates gateway-common-gui.
Files:
9 added
52 edited
1 copied
8 moved

Legend:

Unmodified
Added
Removed
  • common/common-base.pro

    r350 r364  
    1 include(../smssender.pri)
     1include(../locale-base.pri)
    22
    33# The major version of the library which is required to load it.
    44# Increase this, if interfaces in libdatatypes have changed.
    55DEFINES += LIB_COMPATIBILITY_VERSION=\\\"$${VERSION}\\\"
    6 TEMPLATE = lib
     6
    77CONFIG += \
    88    exceptions \
    99    rtti \
    10     staticlib \
    1110    thread
    1211
    13 TARGET = common-base
    14 QMAKE_CLEAN += $$DESTDIR/lib$$TARGET*
    15 QT = \
     12QT += \
    1613    core \
    1714    network \
     
    2219LIBS += -lcryptopp
    2320
    24 install_dev_files:unix {
    25     target.path = /usr/lib/smssender
    26     INSTALLS += target
    27 }
    28 
    2921# Input
    30 HEADERS = \
     22HEADERS += \
    3123    business/iaccount.h \
    3224    business/iaccount_tasks.h \
     
    8577    validation/svalidationresult.h
    8678
    87 SOURCES = \
     79SOURCES += \
    8880    business/iaccount.cpp \
    8981    business/iaccount_tasks.cpp \
     
    118110    validation/svalidationresult.cpp
    119111
    120 RESOURCES = \
     112RESOURCES += \
    121113    lib/common.qrc
    122114
    123 install_dev_files:unix {
     115install-dev-files:unix {
    124116    ADDITIONAL_INSTALLS = $$HEADERS ../*.pri
    125117    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/common
  • common/common.pro

    r315 r364  
    11TEMPLATE = subdirs
    22
    3 SUBDIRS += common-base
    4 common-base.file = common-base.pro
     3your-princess-is-in-another-castle {
     4    # Keep this. It makes qtcreator and qtlinguist think that common-base is an
     5    # actual subdir and shows it / translates it in that way. This is exactly
     6    # what we want.
     7    SUBDIRS += common-base
     8    common-base.file = common-base.pro
     9}
    510
    6 contains(DEFINES, FRONTEND_GUI) {
     11build-frontend-gui {
    712    SUBDIRS += common-gui
    8 
    913    common-gui.file = gui/common-gui.pro
    10     common-gui.depends = common-base
    1114}
  • common/domain/sgroup.cpp

    r316 r364  
    1818#include "sgroup.h"
    1919
    20 #include "domain/scontact.h"
     20#include "common/domain/scontact.h"
    2121
    2222SGroup::SGroup() {
  • common/domain/snumber.cpp

    r363 r364  
    2222#include <QStringList>
    2323
    24 #include "utils/smacros.h"
     24#include "common/utils/smacros.h"
    2525
    2626S_SHARED_IMPL_WITHOUT_EQUALS(SNumber)
  • common/domain/stask.cpp

    r316 r364  
    2626#include <QTimer>
    2727
    28 #include "utils/smacros.h"
    29 #include "utils/staskmanager.h"
     28#include "common/utils/smacros.h"
     29#include "common/utils/staskmanager.h"
    3030
    3131STask::STask(uint UID, const QString& nmespace)
  • common/gui/common-gui.pro

    r350 r364  
    1 include(../../smssender.pri)
     1include(../../smssender-gui.pri)
     2
     3baseBefore()
     4include(../common-base.pro)
     5baseAfter()
    26
    37TEMPLATE = lib
    4 CONFIG += \
    5     thread \
    6     exceptions \
    7     rtti
    8 QT = \
    9     core \
    10     gui \
    11     network \
    12     sql
     8
     9QT += gui
    1310
    1411DESTDIR = ../../
    1512TARGET = common-gui
    1613QMAKE_CLEAN += $$DESTDIR/lib$$TARGET*
    17 
    18 DEFINES += COMMON_GUI_LIBRARY
    19 
    20 LIBS += \
    21     -Wl,-whole-archive \
    22     -L../ -lcommon-base$$LIB_SUFFIX \
    23     -Wl,-no-whole-archive \
    24 \
    25     -lcryptopp
    26 
    27 # Needed so that this target gets rebuilt if they change,
    28 PRE_TARGETDEPS += \
    29     ../libcommon-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    30 
    3114unix {
    3215    target.path = /usr/lib/smssender
     
    3417}
    3518
    36 HEADERS = \
     19DEFINES += COMMON_GUI_LIBRARY
     20
     21LIBS += \
     22    -lcryptopp
     23
     24HEADERS += \
    3725    business/icontactimporter.h \
    3826    business/igateway.h \
     
    4533    ui/isendingdialog.h
    4634
    47 SOURCES = \
     35SOURCES += \
    4836    ui/iclosepreventabledialog.cpp \
    4937    ui/isendingdialog.cpp
    5038
    51 RESOURCES = \
     39RESOURCES += \
    5240    lib/common-gui.qrc
    5341
    54 install_dev_files:unix {
     42install-dev-files:unix {
    5543    ADDITIONAL_INSTALLS = $$HEADERS
     44    ADDITIONAL_INSTALLS -= $$HEADERS_BASE
    5645    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/common/gui
    5746    include(../../additional_installs.pri)
  • common/network/snetworkhelper.cpp

    r316 r364  
    2323#include <QNetworkCookieJar>
    2424
    25 #include "domain/sversion.h"
    26 #include "exceptions/enetworkexception.h"
    27 #include "network/snetworkreply.h"
     25#include "common/domain/sversion.h"
     26#include "common/exceptions/enetworkexception.h"
     27#include "common/network/snetworkreply.h"
    2828
    2929const uint SNetworkHelper::MAX_REDIRECT_COUNT = 10;
  • common/persistence/impl/encryptedstoragehelper_base.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "encryptedstoragehelper.h"
    1918#include "encryptedstoragehelper_base.h"
     19
     20#include "common/persistence/impl/encryptedstoragehelper.h"
    2021
    2122namespace Persistence {
  • common/persistence/impl/versionedstorage.cpp

    r316 r364  
    2323#include <QVariant>
    2424
    25 #include "exceptions/eexception.h"
     25#include "common/exceptions/eexception.h"
    2626
    2727namespace Persistence {
  • common/utils/sutils.cpp

    r316 r364  
    2121#include <cryptopp/default.h>
    2222
    23 #include "exceptions/eexception.h"
     23#include "common/exceptions/eexception.h"
    2424
    2525QString SUtils::getRandomString(int length, const QString &alphabet) {
  • frontend/business/accountmanager.h

    r319 r364  
    3333
    3434public:
     35    // Takes ownership of the accountManager
    3536    AccountManager(AccountInitManager *accountInitManager,
    3637                   Persistence::AccountManager *accountManager);
  • frontend/business/contactimporter/contactfilesimporter_base.cpp

    r320 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "contactfilesimporter.h"
     18#include "contactfilesimporter_base.h"
    1919#include "contactfilesimporter_p.h"
    2020
     
    2424#include "common/domain/scontact.h"
    2525#include "common/domain/snumber.h"
     26#include "frontend/business/contactimporter/contactfilesimporter.h"
    2627
    2728BaseContactFilesImporter::BaseContactFilesImporter(const QString &filename)
  • frontend/business/contactimporter/googlecontactimporter_base.cpp

    r320 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "googlecontactimporter.h"
     18#include "googlecontactimporter_base.h"
    1919
    2020#include <QRegExp>
  • frontend/business/libraryloader_base.cpp

    r335 r364  
    4444    foreach (QString filename, libraryPath.entryList(QDir::Files)) {
    4545        try {
     46#ifdef FRONTEND_GUI
     47            if (!filename.contains("-gui")) {
     48                continue;
     49            }
     50#endif
    4651            loadLibrary(libraryPath.absoluteFilePath(filename));
    4752        } catch (EException& e) {
  • frontend/frontend-base.pro

    r350 r364  
    1 include(../smssender.pri)
     1include(../locale-base.pri)
    22
    3 TEMPLATE = lib
    43CONFIG += \
    54    exceptions \
    65    qt \
    76    rtti \
    8     staticlib \
    97    thread
    10 QT = \
     8
     9QT += \
    1110    core \
    1211    network \
     
    1413    xml
    1514
    16 TARGET = frontend-base
    17 
    1815LIBS += \
    19     -L../ -l$$COMMON$$LIB_SUFFIX \
    2016    -lcryptopp
    2117
    22 # Needed so that this target gets rebuilt if they change,
    23 PRE_TARGETDEPS += \
    24     ../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    25 
    26 install_dev_files:unix {
    27     target.path = /usr/lib/smssender
    28     INSTALLS += target
    29 }
    30 
    31 HEADERS = \
     18HEADERS += \
    3219    business/accountinitmanager.h \
    3320    business/accountintegrationhelper.h \
     
    6148    persistence/restrictedmainstorage.h \
    6249
    63 SOURCES = \
     50SOURCES += \
    6451    business/accountinitmanager.cpp \
    6552    business/accountintegrationhelper.cpp \
    6653    business/accountmanager.cpp \
    6754    business/contactimporter/contactfilelist.cpp \
    68     business/contactimporter/contactfilesimporter.cpp \
    6955    business/contactimporter/contactimporter.cpp \
    70     business/contactimporter/googlecontactimporter.cpp \
    7156    business/contactimportermanager.cpp \
    7257    business/contactmanager.cpp \
     
    9075    persistence/persistenceintegrationhelper.cpp \
    9176    persistence/restrictedmainstorage.cpp \
     77    business/contactimporter/googlecontactimporter_base.cpp \
     78    business/contactimporter/contactfilesimporter_base.cpp
    9279
    93 RESOURCES = \
     80RESOURCES += \
    9481    lib/frontend.qrc
    9582
    96 install_dev_files:unix {
     83install-dev-files:unix {
    9784    ADDITIONAL_INSTALLS = $$HEADERS
    9885    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/frontend
  • frontend/frontend.pro

    r315 r364  
    11TEMPLATE = subdirs
    22
    3 SUBDIRS = frontend-base
    4 frontend-base.file = frontend-base.pro
     3your-princess-is-in-another-castle {
     4    SUBDIRS = frontend-base
     5    frontend-base.file = frontend-base.pro
     6}
    57
    6 contains(DEFINES, FRONTEND_GUI) {
     8build-frontend-gui {
    79    SUBDIRS += frontend-gui
    8 
    910    frontend-gui.file = gui/frontend-gui.pro
    10     frontend-gui.depends = frontend-base
    1111}
  • frontend/gui/frontend-gui.pro

    r342 r364  
    1 include(../../smssender.pri)
     1include(../../smssender-gui.pri)
     2
     3baseBefore()
     4include(../frontend-base.pro)
     5baseAfter()
    26
    37TEMPLATE = app
    4 CONFIG += \
    5     exceptions \
    6     qt \
    7     rtti \
    8     thread
    9 QT = \
    10     core \
    11     gui \
    12     network \
    13     sql \
    14     xml
     8QT += gui
    159
    1610DESTDIR = ../../
    1711TARGET = smssender
    18 
    19 DEFINES += APP_VERSION=\\\"$${VERSION}\\\"
    20 
    21 LIBS += \
    22     -Wl,-whole-archive \
    23     -L../ -lfrontend-base$$LIB_SUFFIX \
    24     -Wl,-no-whole-archive \
    25 \
    26     -L../../ -l$$COMMON$$LIB_SUFFIX \
    27 
    28 # Needed so that this target gets rebuilt if they change,
    29 PRE_TARGETDEPS += \
    30     ../libfrontend-base$${LIB_SUFFIX}.$$EXT_STATICLIB \
    31     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    32 
    3312mac {
    3413    TARGET = SMSSender
     
    4625}
    4726
     27DEFINES += APP_VERSION=\\\"$${VERSION}\\\"
     28
     29LIBS += \
     30    -L../../ -lcommon-gui$$LIB_SUFFIX \
     31
     32# Needed so that this target gets rebuilt if they change,
     33PRE_TARGETDEPS += \
     34    ../../libcommon-gui$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     35
    4836INCLUDEPATH += \
    4937    ui/components/
     
    5139QMAKE_UIC += -p
    5240
    53 HEADERS =  \
     41HEADERS +=  \
    5442    bootstrap.h \
    5543    business/contactfilesimporter.h \
     
    9886    ui/updatedialog.h \
    9987
    100 SOURCES = \
     88SOURCES += \
    10189    bootstrap.cpp \
    10290    business/contactfilesimporter.cpp \
     
    146134    ui/updatedialog.cpp \
    147135
    148 FORMS = \
     136FORMS += \
    149137    ui/about.ui \
    150138    ui/accountlist.ui \
     
    164152    ui/updatedialog.ui \
    165153
    166 RESOURCES = \
     154RESOURCES += \
    167155    lib/frontend-gui.qrc \
  • frontend/gui/locale/de.ts

    r355 r364  
    439439    <name>QObject</name>
    440440    <message>
    441         <location filename="../ui/guimanager.cpp" line="62"/>
     441        <location filename="../ui/guimanager.cpp" line="63"/>
    442442        <source>Error occured</source>
    443443        <translation>Fehler aufgetreten</translation>
     
    728728    <name>UI::AddressBook</name>
    729729    <message>
    730         <location filename="../ui/addressbook_contact.cpp" line="82"/>
    731         <location filename="../ui/addressbook_group.cpp" line="78"/>
     730        <location filename="../ui/addressbook_contact.cpp" line="89"/>
     731        <location filename="../ui/addressbook_group.cpp" line="85"/>
    732732        <source>SMSSender</source>
    733733        <translation>SMSSender</translation>
    734734    </message>
    735735    <message>
    736         <location filename="../ui/addressbook_contact.cpp" line="83"/>
     736        <location filename="../ui/addressbook_contact.cpp" line="90"/>
    737737        <source>Do you really want to remove this contact?</source>
    738738        <translation>Soll dieser Kontakt wirklich gelöscht werden?</translation>
    739739    </message>
    740740    <message>
    741         <location filename="../ui/addressbook_group.cpp" line="79"/>
     741        <location filename="../ui/addressbook_group.cpp" line="86"/>
    742742        <source>Do you really want to remove this group?</source>
    743743        <translation>Soll diese Gruppe wirklich gelöscht werden?</translation>
     
    988988    </message>
    989989    <message>
    990         <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="111"/>
     990        <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="109"/>
    991991        <source>An error occured while importing contacts:</source>
    992992        <translation>Beim Importieren der Kontakte trat ein Fehler auf:</translation>
     
    10041004    <name>UI::Main</name>
    10051005    <message>
    1006         <location filename="../ui/main.cpp" line="452"/>
     1006        <location filename="../ui/main.cpp" line="480"/>
    10071007        <source>SMSSender</source>
    10081008        <translation>SMSSender</translation>
    10091009    </message>
    10101010    <message>
    1011         <location filename="../ui/main.cpp" line="453"/>
     1011        <location filename="../ui/main.cpp" line="481"/>
    10121012        <source>This number is not yet in your address book. Do you want to add it?</source>
    10131013        <translation>Diese Nummer ist noch nicht im Adressbuch eingetragen. Willst du sie hinzufügen?</translation>
    10141014    </message>
    10151015    <message>
    1016         <location filename="../ui/main.cpp" line="552"/>
     1016        <location filename="../ui/main.cpp" line="587"/>
    10171017        <source>%1 SMS</source>
    10181018        <translation>%1 SMS</translation>
    10191019    </message>
    10201020    <message>
    1021         <location filename="../ui/main.cpp" line="623"/>
     1021        <location filename="../ui/main.cpp" line="660"/>
    10221022        <source>An error occured while initializing the account &quot;%1&quot;.</source>
    10231023        <translation>Ein Fehler trat wärend dem Initialisieren des Kontos &quot;%1&quot; auf.</translation>
    10241024    </message>
    10251025    <message>
    1026         <location filename="../ui/main.cpp" line="644"/>
     1026        <location filename="../ui/main.cpp" line="687"/>
    10271027        <source>Error occured</source>
    10281028        <translation>Fehler aufgetreten</translation>
    10291029    </message>
    10301030    <message>
    1031         <location filename="../ui/main.cpp" line="645"/>
     1031        <location filename="../ui/main.cpp" line="688"/>
    10321032        <source>Errors occured while loading your accounts.</source>
    10331033        <translation>Beim Laden der Konten trat ein Fehler auf.</translation>
    10341034    </message>
    10351035    <message>
    1036         <location filename="../ui/main.cpp" line="675"/>
     1036        <location filename="../ui/main.cpp" line="720"/>
    10371037        <source>SMS sent</source>
    10381038        <translation>SMS gesendet</translation>
    10391039    </message>
    10401040    <message>
    1041         <location filename="../ui/main.cpp" line="676"/>
     1041        <location filename="../ui/main.cpp" line="721"/>
    10421042        <source>The sms has been sent.</source>
    10431043        <translation>Die SMS wurde versendet.</translation>
    10441044    </message>
    10451045    <message>
    1046         <location filename="../ui/main.cpp" line="689"/>
     1046        <location filename="../ui/main.cpp" line="737"/>
    10471047        <source>An error occured while sending the sms.</source>
    10481048        <translation>Ein Fehler trat wärend dem Senden der SMS auf.</translation>
     
    11261126    </message>
    11271127    <message>
    1128         <location filename="../ui/settingsdialog.cpp" line="418"/>
     1128        <location filename="../ui/settingsdialog.cpp" line="417"/>
    11291129        <source>No update available.</source>
    11301130        <translation>Keine Aktualisierung verfügbar.</translation>
    11311131    </message>
    11321132    <message>
    1133         <location filename="../ui/settingsdialog.cpp" line="419"/>
     1133        <location filename="../ui/settingsdialog.cpp" line="418"/>
    11341134        <source>You already have the newest version.</source>
    11351135        <translation>Du hast bereits die neuste Version.</translation>
  • frontend/gui/locale/de_CH.ts

    r355 r364  
    439439    <name>QObject</name>
    440440    <message>
    441         <location filename="../ui/guimanager.cpp" line="62"/>
     441        <location filename="../ui/guimanager.cpp" line="63"/>
    442442        <source>Error occured</source>
    443443        <translation>Fähler ufträtte</translation>
     
    728728    <name>UI::AddressBook</name>
    729729    <message>
    730         <location filename="../ui/addressbook_contact.cpp" line="82"/>
    731         <location filename="../ui/addressbook_group.cpp" line="78"/>
     730        <location filename="../ui/addressbook_contact.cpp" line="89"/>
     731        <location filename="../ui/addressbook_group.cpp" line="85"/>
    732732        <source>SMSSender</source>
    733733        <translation>SMSSender</translation>
    734734    </message>
    735735    <message>
    736         <location filename="../ui/addressbook_contact.cpp" line="83"/>
     736        <location filename="../ui/addressbook_contact.cpp" line="90"/>
    737737        <source>Do you really want to remove this contact?</source>
    738738        <translation>Söll dä Kontaggt wirklich entfärnt wärde?</translation>
    739739    </message>
    740740    <message>
    741         <location filename="../ui/addressbook_group.cpp" line="79"/>
     741        <location filename="../ui/addressbook_group.cpp" line="86"/>
    742742        <source>Do you really want to remove this group?</source>
    743743        <translation>Söll die Gruppe wirklich entfärnt wärde?</translation>
     
    988988    </message>
    989989    <message>
    990         <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="111"/>
     990        <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="109"/>
    991991        <source>An error occured while importing contacts:</source>
    992992        <translation>Bim Importiere vo de Kontäggt isch e Fähler ufträtte:</translation>
     
    10041004    <name>UI::Main</name>
    10051005    <message>
    1006         <location filename="../ui/main.cpp" line="452"/>
     1006        <location filename="../ui/main.cpp" line="480"/>
    10071007        <source>SMSSender</source>
    10081008        <translation>SMSSender</translation>
    10091009    </message>
    10101010    <message>
    1011         <location filename="../ui/main.cpp" line="453"/>
     1011        <location filename="../ui/main.cpp" line="481"/>
    10121012        <source>This number is not yet in your address book. Do you want to add it?</source>
    10131013        <translation>Die Nummere isch noni im Adrässbuech iitreit. Willsch se drzuefüege?</translation>
    10141014    </message>
    10151015    <message>
    1016         <location filename="../ui/main.cpp" line="552"/>
     1016        <location filename="../ui/main.cpp" line="587"/>
    10171017        <source>%1 SMS</source>
    10181018        <translation>%1 SMS</translation>
    10191019    </message>
    10201020    <message>
    1021         <location filename="../ui/main.cpp" line="623"/>
     1021        <location filename="../ui/main.cpp" line="660"/>
    10221022        <source>An error occured while initializing the account &quot;%1&quot;.</source>
    10231023        <translation>Bim Initsialisiere vom Konto &quot;%1&quot; isch e Fähler ufträtte.</translation>
    10241024    </message>
    10251025    <message>
    1026         <location filename="../ui/main.cpp" line="644"/>
     1026        <location filename="../ui/main.cpp" line="687"/>
    10271027        <source>Error occured</source>
    10281028        <translation>Fähler ufträtte</translation>
    10291029    </message>
    10301030    <message>
    1031         <location filename="../ui/main.cpp" line="645"/>
     1031        <location filename="../ui/main.cpp" line="688"/>
    10321032        <source>Errors occured while loading your accounts.</source>
    10331033        <translation>Bim Lade vo de Kontene isch e Fähler ufträtte.</translation>
    10341034    </message>
    10351035    <message>
    1036         <location filename="../ui/main.cpp" line="675"/>
     1036        <location filename="../ui/main.cpp" line="720"/>
    10371037        <source>SMS sent</source>
    10381038        <translation>SMS gschiggt</translation>
    10391039    </message>
    10401040    <message>
    1041         <location filename="../ui/main.cpp" line="676"/>
     1041        <location filename="../ui/main.cpp" line="721"/>
    10421042        <source>The sms has been sent.</source>
    10431043        <translation>S SMS isch gschiggt worde.</translation>
    10441044    </message>
    10451045    <message>
    1046         <location filename="../ui/main.cpp" line="689"/>
     1046        <location filename="../ui/main.cpp" line="737"/>
    10471047        <source>An error occured while sending the sms.</source>
    10481048        <translation>Bim Sände vom SMS isch e Fähler ufträtte.</translation>
     
    11261126    </message>
    11271127    <message>
    1128         <location filename="../ui/settingsdialog.cpp" line="418"/>
     1128        <location filename="../ui/settingsdialog.cpp" line="417"/>
    11291129        <source>No update available.</source>
    11301130        <translation>Kei Aggtualisierig ume.</translation>
    11311131    </message>
    11321132    <message>
    1133         <location filename="../ui/settingsdialog.cpp" line="419"/>
     1133        <location filename="../ui/settingsdialog.cpp" line="418"/>
    11341134        <source>You already have the newest version.</source>
    11351135        <translation>Du hesch scho s Neuste vom Neuste.</translation>
  • frontend/gui/locale/fr.ts

    r355 r364  
    441441    <name>QObject</name>
    442442    <message>
    443         <location filename="../ui/guimanager.cpp" line="62"/>
     443        <location filename="../ui/guimanager.cpp" line="63"/>
    444444        <source>Error occured</source>
    445445        <translation>Un erreur s&apos;est produit</translation>
     
    730730    <name>UI::AddressBook</name>
    731731    <message>
    732         <location filename="../ui/addressbook_contact.cpp" line="82"/>
    733         <location filename="../ui/addressbook_group.cpp" line="78"/>
     732        <location filename="../ui/addressbook_contact.cpp" line="89"/>
     733        <location filename="../ui/addressbook_group.cpp" line="85"/>
    734734        <source>SMSSender</source>
    735735        <translation>SMSSender</translation>
    736736    </message>
    737737    <message>
    738         <location filename="../ui/addressbook_contact.cpp" line="83"/>
     738        <location filename="../ui/addressbook_contact.cpp" line="90"/>
    739739        <source>Do you really want to remove this contact?</source>
    740740        <translation>Voulez-vous vraiment supprimer ce contact?</translation>
    741741    </message>
    742742    <message>
    743         <location filename="../ui/addressbook_group.cpp" line="79"/>
     743        <location filename="../ui/addressbook_group.cpp" line="86"/>
    744744        <source>Do you really want to remove this group?</source>
    745745        <translation>Voulez-vous vraiment supprimer ce groupe?</translation>
     
    990990    </message>
    991991    <message>
    992         <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="111"/>
     992        <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="109"/>
    993993        <source>An error occured while importing contacts:</source>
    994994        <translation type="unfinished"></translation>
     
    10061006    <name>UI::Main</name>
    10071007    <message>
    1008         <location filename="../ui/main.cpp" line="452"/>
     1008        <location filename="../ui/main.cpp" line="480"/>
    10091009        <source>SMSSender</source>
    10101010        <translation>SMSSender</translation>
    10111011    </message>
    10121012    <message>
    1013         <location filename="../ui/main.cpp" line="453"/>
     1013        <location filename="../ui/main.cpp" line="481"/>
    10141014        <source>This number is not yet in your address book. Do you want to add it?</source>
    10151015        <translation>Ce numéro n&apos;est pas encore dans votre carnet d&apos;adresse. Souhaitez-vous de l&apos;ajouter?</translation>
    10161016    </message>
    10171017    <message>
    1018         <location filename="../ui/main.cpp" line="552"/>
     1018        <location filename="../ui/main.cpp" line="587"/>
    10191019        <source>%1 SMS</source>
    10201020        <translation>%1 SMS</translation>
    10211021    </message>
    10221022    <message>
    1023         <location filename="../ui/main.cpp" line="623"/>
     1023        <location filename="../ui/main.cpp" line="660"/>
    10241024        <source>An error occured while initializing the account &quot;%1&quot;.</source>
    10251025        <translation>Un erreur s&apos;est produit lorsque l&apos;initialisation du compte &quot;%1&quot;.</translation>
    10261026    </message>
    10271027    <message>
    1028         <location filename="../ui/main.cpp" line="644"/>
     1028        <location filename="../ui/main.cpp" line="687"/>
    10291029        <source>Error occured</source>
    10301030        <translation>Un erreur s&apos;est produit</translation>
    10311031    </message>
    10321032    <message>
    1033         <location filename="../ui/main.cpp" line="645"/>
     1033        <location filename="../ui/main.cpp" line="688"/>
    10341034        <source>Errors occured while loading your accounts.</source>
    10351035        <translation>Un erreur s&apos;est produit lorsque le chargement de vos comptes.</translation>
    10361036    </message>
    10371037    <message>
    1038         <location filename="../ui/main.cpp" line="675"/>
     1038        <location filename="../ui/main.cpp" line="720"/>
    10391039        <source>SMS sent</source>
    10401040        <translation>sms envoyé</translation>
    10411041    </message>
    10421042    <message>
    1043         <location filename="../ui/main.cpp" line="676"/>
     1043        <location filename="../ui/main.cpp" line="721"/>
    10441044        <source>The sms has been sent.</source>
    10451045        <translation>Le sms a été envoyé.</translation>
    10461046    </message>
    10471047    <message>
    1048         <location filename="../ui/main.cpp" line="689"/>
     1048        <location filename="../ui/main.cpp" line="737"/>
    10491049        <source>An error occured while sending the sms.</source>
    10501050        <translation>Un erreur s&apos;est produit lorsque l&apos;envoy du sms.</translation>
     
    11281128    </message>
    11291129    <message>
    1130         <location filename="../ui/settingsdialog.cpp" line="418"/>
     1130        <location filename="../ui/settingsdialog.cpp" line="417"/>
    11311131        <source>No update available.</source>
    11321132        <translation type="unfinished"></translation>
    11331133    </message>
    11341134    <message>
    1135         <location filename="../ui/settingsdialog.cpp" line="419"/>
     1135        <location filename="../ui/settingsdialog.cpp" line="418"/>
    11361136        <source>You already have the newest version.</source>
    11371137        <translation type="unfinished"></translation>
  • frontend/gui/locale/it.ts

    r355 r364  
    435435    <name>QObject</name>
    436436    <message>
    437         <location filename="../ui/guimanager.cpp" line="62"/>
     437        <location filename="../ui/guimanager.cpp" line="63"/>
    438438        <source>Error occured</source>
    439439        <translation type="unfinished"></translation>
     
    716716    <name>UI::AddressBook</name>
    717717    <message>
    718         <location filename="../ui/addressbook_contact.cpp" line="82"/>
    719         <location filename="../ui/addressbook_group.cpp" line="78"/>
     718        <location filename="../ui/addressbook_contact.cpp" line="89"/>
     719        <location filename="../ui/addressbook_group.cpp" line="85"/>
    720720        <source>SMSSender</source>
    721721        <translation type="unfinished"></translation>
    722722    </message>
    723723    <message>
    724         <location filename="../ui/addressbook_contact.cpp" line="83"/>
     724        <location filename="../ui/addressbook_contact.cpp" line="90"/>
    725725        <source>Do you really want to remove this contact?</source>
    726726        <translation type="unfinished"></translation>
    727727    </message>
    728728    <message>
    729         <location filename="../ui/addressbook_group.cpp" line="79"/>
     729        <location filename="../ui/addressbook_group.cpp" line="86"/>
    730730        <source>Do you really want to remove this group?</source>
    731731        <translation type="unfinished"></translation>
     
    976976    </message>
    977977    <message>
    978         <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="111"/>
     978        <location filename="../ui/importcontacts/importcontacts_page_import.cpp" line="109"/>
    979979        <source>An error occured while importing contacts:</source>
    980980        <translation type="unfinished"></translation>
     
    992992    <name>UI::Main</name>
    993993    <message>
    994         <location filename="../ui/main.cpp" line="452"/>
     994        <location filename="../ui/main.cpp" line="480"/>
    995995        <source>SMSSender</source>
    996996        <translation type="unfinished"></translation>
    997997    </message>
    998998    <message>
    999         <location filename="../ui/main.cpp" line="453"/>
     999        <location filename="../ui/main.cpp" line="481"/>
    10001000        <source>This number is not yet in your address book. Do you want to add it?</source>
    10011001        <translation type="unfinished"></translation>
    10021002    </message>
    10031003    <message>
    1004         <location filename="../ui/main.cpp" line="552"/>
     1004        <location filename="../ui/main.cpp" line="587"/>
    10051005        <source>%1 SMS</source>
    10061006        <translation type="unfinished"></translation>
    10071007    </message>
    10081008    <message>
    1009         <location filename="../ui/main.cpp" line="623"/>
     1009        <location filename="../ui/main.cpp" line="660"/>
    10101010        <source>An error occured while initializing the account &quot;%1&quot;.</source>
    10111011        <translation type="unfinished"></translation>
    10121012    </message>
    10131013    <message>
    1014         <location filename="../ui/main.cpp" line="644"/>
     1014        <location filename="../ui/main.cpp" line="687"/>
    10151015        <source>Error occured</source>
    10161016        <translation type="unfinished"></translation>
    10171017    </message>
    10181018    <message>
    1019         <location filename="../ui/main.cpp" line="645"/>
     1019        <location filename="../ui/main.cpp" line="688"/>
    10201020        <source>Errors occured while loading your accounts.</source>
    10211021        <translation type="unfinished"></translation>
    10221022    </message>
    10231023    <message>
    1024         <location filename="../ui/main.cpp" line="675"/>
     1024        <location filename="../ui/main.cpp" line="720"/>
    10251025        <source>SMS sent</source>
    10261026        <translation type="unfinished"></translation>
    10271027    </message>
    10281028    <message>
    1029         <location filename="../ui/main.cpp" line="676"/>
     1029        <location filename="../ui/main.cpp" line="721"/>
    10301030        <source>The sms has been sent.</source>
    10311031        <translation type="unfinished"></translation>
    10321032    </message>
    10331033    <message>
    1034         <location filename="../ui/main.cpp" line="689"/>
     1034        <location filename="../ui/main.cpp" line="737"/>
    10351035        <source>An error occured while sending the sms.</source>
    10361036        <translation type="unfinished"></translation>
     
    11141114    </message>
    11151115    <message>
     1116        <location filename="../ui/settingsdialog.cpp" line="417"/>
     1117        <source>No update available.</source>
     1118        <translation type="unfinished"></translation>
     1119    </message>
     1120    <message>
    11161121        <location filename="../ui/settingsdialog.cpp" line="418"/>
    1117         <source>No update available.</source>
    1118         <translation type="unfinished"></translation>
    1119     </message>
    1120     <message>
    1121         <location filename="../ui/settingsdialog.cpp" line="419"/>
    11221122        <source>You already have the newest version.</source>
    11231123        <translation type="unfinished"></translation>
  • frontend/persistence/mainstorage_base_storage.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/mainstorage_base.h"
     18#include "mainstorage_base.h"
    1919
    2020#include <QSqlError>
  • frontend/persistence/pers_accountmanager.cpp

    r358 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/accountmanager.h"
     18#include "accountmanager.h"
    1919
    2020#include <QDebug>
  • frontend/persistence/pers_accountmanager_storage.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/accountmanager.h"
     18#include "accountmanager.h"
    1919
    2020#include <QSqlError>
  • frontend/persistence/pers_contactmanager.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/contactmanager.h"
     18#include "contactmanager.h"
    1919
    2020#include <QDebug>
  • frontend/persistence/pers_contactmanager_storage.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/contactmanager.h"
     18#include "contactmanager.h"
    1919
    2020#include <QSqlError>
  • frontend/persistence/pers_database.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/database.h"
     18#include "database.h"
    1919
    2020#include <QObject>
  • frontend/persistence/pers_groupmanager.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/groupmanager.h"
     18#include "groupmanager.h"
    1919
    2020#include <QDebug>
  • frontend/persistence/pers_groupmanager_storage.cpp

    r316 r364  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "persistence/groupmanager.h"
     18#include "groupmanager.h"
    1919
    2020#include <QSqlError>
  • gateways/ETHZ/ethz-base.pro

    r350 r364  
    1 include(../../smssender.pri)
     1include(../../locale-base.pri)
    22
    3 BASE_VERSION = 1.0
    4 
    5 TARGET = ethz-base
    6 
    7 TEMPLATE = lib
    8 CONFIG += \
    9     staticlib
    10 
    11 QT = \
     3QT += \
    124    core \
    135    network \
     
    157    xml
    168
    17 LIBS += \
    18     -L../../ -l$$COMMON$$LIB_SUFFIX \
    19     -L../../ -lgateways-common$$LIB_SUFFIX
    20 
    21 # Needed so that this target gets rebuilt if they change,
    22 PRE_TARGETDEPS += \
    23     ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    24     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    25 
    26 install_dev_files:unix {
    27     target.path = /usr/lib/smssender/gateways
    28     INSTALLS += target
    29 }
    30 
    31 HEADERS = \
     9HEADERS += \
    3210    business/account.h \
    3311    business/account_tasks.h \
     
    3513    business/gateway.h \
    3614
    37 SOURCES = \
     15SOURCES += \
    3816    business/account.cpp \
    3917    business/account_costs.cpp \
     
    4321    business/gateway.cpp \
    4422
    45 RESOURCES = \
     23RESOURCES += \
    4624    lib/ethz.qrc
    4725
  • gateways/ETHZ/ethz.pro

    r348 r364  
    11TEMPLATE = subdirs
    22
    3 SUBDIRS = ethz-base
    4 ethz-base.file = ethz-base.pro
    5 
    6 contains(DEFINES, FRONTEND_GUI) {
    7     SUBDIRS += ethz-gui
    8 
    9     ethz-gui.file = gui/ethz-gui.pro
    10     ethz-gui.depends = ethz-base
     3your-princess-is-in-another-castle {
     4    SUBDIRS = ethz-base
     5    ethz-base.file = ethz-base.pro
    116}
    127
     8build-frontend-gui {
     9    SUBDIRS += ethz-gui
     10    ethz-gui.file = gui/ethz-gui.pro
     11}
  • gateways/ETHZ/gui/ethz-gui.pro

    r347 r364  
    1 !include(../../gateways.pri):!include(/usr/include/smssender/gateways.pri):error("Could not include gateways.pri")
     1include(../../gateways-gui.pri)
    22
    3 TARGET = ethz
    4 DESTDIR = ../../
     3baseBefore()
     4include(../ethz-base.pro)
     5baseAfter()
    56
    6 QT = \
    7     core \
    8     gui \
    9     network \
    10     sql \
    11     xml
     7TARGET = ethz-gui
    128
    13 LIBS += \
    14     -Wl,-whole-archive \
    15     -L../ -lethz-base$$LIB_SUFFIX \
    16     -Wl,-no-whole-archive
    17 
    18 # Needed so that this target gets rebuilt if they change,
    19 PRE_TARGETDEPS += \
    20     ../libethz-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    21 
    22 HEADERS = \
     9HEADERS += \
    2310    ethz.h \
    2411    ui/settingswidget.h \
    2512
    26 SOURCES = \
    27     business/gateway.cpp \
     13SOURCES += \
     14    business/gateway_gui.cpp \
    2815    ethz.cpp \
    2916    ui/settingswidget.cpp \
    3017
    31 FORMS = \
     18FORMS += \
    3219    ui/settingswidget.ui
    3320
    34 RESOURCES = \
     21RESOURCES += \
    3522    lib/ethz-gui.qrc
  • gateways/Schoolnet/business/account.cpp

    r334 r364  
    3838#include "gateways/common/business/defaultlogininittask.h"
    3939#include "gateways/Schoolnet/business/gateway.h"
    40 #include "persistence/accountstoragehelper.h"
     40#include "gateways/Schoolnet/persistence/accountstoragehelper.h"
    4141
    4242namespace Schoolnet {
  • gateways/Schoolnet/business/account.h

    r320 r364  
    6060
    6161public: /* IAccount */
    62     Persistence::IStorageHelper* createStorageHelper(Persistence::IMainStorage *storage);
    63     IValidator* createValidator() const;
     62    Persistence::IStorageHelper *createStorageHelper(Persistence::IMainStorage *storage);
     63    IValidator *createValidator() const;
    6464
    6565public: /* IAccount - costs */
  • gateways/Schoolnet/gui/schoolnet-gui.pro

    r345 r364  
    1 !include(../../gateways.pri):!include(/usr/include/smssender/gateways.pri):error("Could not include gateways.pri")
     1include(../../gateways-gui.pri)
    22
    3 TARGET = schoolnet
    4 DESTDIR = ../../
     3baseBefore()
     4include(../schoolnet-base.pro)
     5baseAfter()
    56
    6 QT = \
    7     core \
    8     gui \
    9     network \
    10     sql \
    11     xml
     7TARGET = schoolnet-gui
    128
    13 LIBS += \
    14     -Wl,-whole-archive \
    15     -L../ -lschoolnet-base$$LIB_SUFFIX \
    16     -Wl,-no-whole-archive
    17 
    18 # Needed so that this target gets rebuilt if they change,
    19 PRE_TARGETDEPS += \
    20     ../libschoolnet-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    21 
    22 HEADERS = \
     9HEADERS += \
    2310    schoolnet.h \
    2411    ui/models/questionitemmodel.h \
     
    3219    ui/widgets/settingswidget.h
    3320
    34 SOURCES = \
    35     business/gateway.cpp \
     21SOURCES += \
     22    business/gateway_gui.cpp \
    3623    schoolnet.cpp \
    3724    ui/models/questionitemmodel.cpp \
     
    4229    ui/senddialogintegration.cpp \
    4330    ui/widgets/questionbox.cpp \
    44     ui/widgets/settingswidget.cpp
     31    ui/widgets/settingswidget.cpp \
    4532
    46 FORMS = \
     33FORMS += \
    4734    ui/questionlist.ui \
    4835    ui/widgets/questionbox.ui \
    4936    ui/widgets/settingswidget.ui
    5037
    51 RESOURCES = \
     38RESOURCES += \
    5239    lib/schoolnet-gui.qrc
  • gateways/Schoolnet/schoolnet-base.pro

    r350 r364  
    1 include(../../smssender.pri)
     1include(../../locale-base.pri)
    22
    3 BASE_VERSION = 2.0
    4 
    5 TARGET = schoolnet-base
    6 
    7 TEMPLATE = lib
    8 CONFIG += \
    9     staticlib
    10 
    11 QT = \
     3QT += \
    124    core \
    135    network \
     
    157    xml
    168
    17 LIBS += \
    18     -L../../ -l$$COMMON$$LIB_SUFFIX \
    19     -L../../ -lgateways-common$$LIB_SUFFIX
    20 
    21 # Needed so that this target gets rebuilt if they change,
    22 PRE_TARGETDEPS += \
    23     ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    24     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    25 
    26 install_dev_files:unix {
    27     target.path = /usr/lib/smssender/gateways
    28     INSTALLS += target
    29 }
    30 
    31 HEADERS = \
     9HEADERS += \
    3210    business/account.h \
    3311    business/account_tasks.h \
     
    4321    persistence/deepthought/deepthoughtstorage.h
    4422
    45 SOURCES = \
     23SOURCES += \
    4624    business/account.cpp \
    4725    business/account_costs.cpp \
     
    6139    network/httphelper.cpp \
    6240    persistence/accountstoragehelper.cpp \
    63     persistence/deepthought/deepthoughtstorage.cpp
     41    persistence/deepthought/deepthoughtstorage.cpp \
    6442
    65 RESOURCES = \
     43RESOURCES += \
    6644    lib/schoolnet.qrc
    6745
    68 install_dev_files:unix {
     46install-dev-files:unix {
    6947    ADDITIONAL_INSTALLS = $$HEADERS
    7048    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/gateways/Schoolnet
  • gateways/Schoolnet/schoolnet.pro

    r315 r364  
    11TEMPLATE = subdirs
    22
    3 SUBDIRS = schoolnet-base
    4 schoolnet-base.file = schoolnet-base.pro
    5 
    6 contains(DEFINES, FRONTEND_GUI) {
    7     SUBDIRS += schoolnet-gui
    8 
    9     schoolnet-gui.file = gui/schoolnet-gui.pro
    10     schoolnet-gui.depends = schoolnet-base
     3your-princess-is-in-another-castle {
     4    SUBDIRS = schoolnet-base
     5    schoolnet-base.file = schoolnet-base.pro
    116}
    127
     8build-frontend-gui {
     9    SUBDIRS += schoolnet-gui
     10    schoolnet-gui.file = gui/schoolnet-gui.pro
     11}
     12
  • gateways/Smartphone/business/smartphoneconnector.cpp

    r336 r364  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #include "business/smartphoneconnector.h"
     18#include "smartphoneconnector.h"
    1919
    2020#include <QNetworkInterface>
  • gateways/Smartphone/gui/smartphone-gui.pro

    r345 r364  
    1 !include(../../gateways.pri):!include(/usr/include/smssender/gateways.pri):error("Could not include gateways.pri")
     1include(../../gateways-gui.pri)
    22
    3 TARGET = smartphone
    4 DESTDIR = ../../
     3baseBefore()
     4include(../smartphone-base.pro)
     5baseAfter()
    56
    6 QT = \
    7     core \
    8     gui \
    9     network \
    10     sql \
    11     xml
     7TARGET = smartphone-gui
    128
    139LIBS += \
    14     -Wl,-whole-archive \
    15     -L../ -lsmartphone-base$$LIB_SUFFIX \
    16     -Wl,-no-whole-archive \
    17 \
    1810    -Llib/ -lqrencode
    19 
    20 # Needed so that this target gets rebuilt if they change,
    21 PRE_TARGETDEPS += \
    22     ../libsmartphone-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    2311
    2412unix {
     
    3220    ui/components/
    3321
    34 HEADERS = \
     22HEADERS += \
    3523    smartphone.h \
    3624    ui/components/qrcode.h \
    3725    ui/settingswidget.h \
    3826
    39 SOURCES = \
    40     business/gateway.cpp \
     27SOURCES += \
     28    business/gateway_gui.cpp \
    4129    smartphone.cpp \
    4230    ui/components/qrcode.cpp \
    4331    ui/settingswidget.cpp \
    4432
    45 FORMS = \
     33FORMS += \
    4634    ui/settingswidget.ui
    4735
    48 RESOURCES = \
     36RESOURCES += \
    4937    lib/smartphone-gui.qrc
  • gateways/Smartphone/smartphone-base.pro

    r350 r364  
    1 include(../../smssender.pri)
     1include(../../locale-base.pri)
    22
    3 BASE_VERSION = 1.0
    4 
    5 TARGET = smartphone-base
    6 
    7 TEMPLATE = lib
    8 CONFIG += \
    9     staticlib
    10 
    11 QT = \
     3QT += \
    124    core\
    135    network \
     
    157    xml
    168
    17 LIBS += \
    18     -L../../ -l$$COMMON$$LIB_SUFFIX \
    19     -L../../ -lgateways-common$$LIB_SUFFIX \
    20 
    21 # Needed so that this target gets rebuilt if they change,
    22 PRE_TARGETDEPS += \
    23     ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    24     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    25 
    26 install_dev_files:unix {
    27     target.path = /usr/lib/smssender/gateways
    28     INSTALLS += target
    29 }
    30 
    31 HEADERS = \
     9HEADERS += \
    3210    business/account.h \
    3311    business/account_tasks.h \
     
    5129    persistence/gatewaystoragehelper.h \
    5230
    53 SOURCES = \
     31SOURCES += \
    5432    business/account.cpp \
    5533    business/account_costs.cpp \
     
    7250    persistence/gatewaystoragehelper.cpp \
    7351
    74 RESOURCES =\
     52RESOURCES +=\
    7553    lib/smartphone.qrc
    7654
    77 install_dev_files:unix {
     55install-dev-files:unix {
    7856    ADDITIONAL_INSTALLS = $$HEADERS
    7957    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/gateways/Smartphone
  • gateways/Smartphone/smartphone.pro

    r336 r364  
    11TEMPLATE = subdirs
    22
    3 SUBDIRS = smartphone-base
    4 smartphone-base.file = smartphone-base.pro
    5 
    6 contains(DEFINES, FRONTEND_GUI) {
    7     SUBDIRS += smartphone-gui
    8 
    9     smartphone-gui.file = gui/smartphone-gui.pro
    10     smartphone-gui.depends = smartphone-base
     3your-princess-is-in-another-castle {
     4    SUBDIRS = smartphone-base
     5    smartphone-base.file = smartphone-base.pro
    116}
    127
     8build-frontend-gui {
     9    SUBDIRS += smartphone-gui
     10    smartphone-gui.file = gui/smartphone-gui.pro
     11}
     12
  • gateways/Sunrise/business/account_costs.cpp

    r330 r364  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #include "business/account.h"
     18#include "account.h"
    1919
    2020#include <math.h>
  • gateways/Sunrise/gui/sunrise-gui.pro

    r342 r364  
    1 !include(../../gateways.pri):!include(/usr/include/smssender/gateways.pri):error("Could not include gateways.pri")
    2 include(../sunrise.pri)
     1include(../../gateways-gui.pri)
    32
    4 TARGET = sunrise
    5 DESTDIR = ../../
     3baseBefore()
     4include(../sunrise-base.pro)
     5baseAfter()
    66
    7 QT += \
    8     core \
    9     gui \
    10     network \
    11     sql
     7TARGET = sunrise-gui
    128
    13 LIBS += \
    14     -Wl,-whole-archive \
    15     -L../ -lsunrise-base$$LIB_SUFFIX \
    16     -Wl,-no-whole-archive
    17 
    18 # Needed so that this target gets rebuilt if they change,
    19 PRE_TARGETDEPS += \
    20     ../libsunrise-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    21 
    22 HEADERS = \
     9HEADERS += \
    2310    sunrise.h \
    2411    ui/settingswidget.h \
    2512    business/account_tasks.h
    2613
    27 SOURCES = \
     14SOURCES += \
     15    business/account_task_sendsms.cpp \
     16    business/gateway_base.cpp \
    2817    sunrise.cpp \
    2918    ui/settingswidget.cpp \
    30     business/account_task_sendsms.cpp \
    31     business/gateway.cpp
    3219
    33 FORMS = \
     20FORMS += \
    3421    ui/settingswidget.ui
    3522
    36 RESOURCES = \
     23RESOURCES += \
    3724    lib/sunrise-gui.qrc
  • gateways/Sunrise/locale/de.ts

    r337 r364  
    22<!DOCTYPE TS>
    33<TS version="2.1" language="de" sourcelanguage="en">
     4<context>
     5    <name>BaseSMSSendTask</name>
     6    <message>
     7        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
     8        <translation type="unfinished">Der SMS-Versandt wurde abgebrochen. Ein Teil der SMS wurde zu diesem Zeitpunkt jedoch bereits versendet.</translation>
     9    </message>
     10</context>
    411<context>
    512    <name>QObject</name>
     
    1724    <message>
    1825        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
    19         <translation>Der SMS-Versandt wurde abgebrochen. Ein Teil der SMS wurde zu diesem Zeitpunkt jedoch bereits versendet.</translation>
     26        <translation type="vanished">Der SMS-Versandt wurde abgebrochen. Ein Teil der SMS wurde zu diesem Zeitpunkt jedoch bereits versendet.</translation>
    2027    </message>
    2128</context>
  • gateways/Sunrise/locale/de_CH.ts

    r337 r364  
    22<!DOCTYPE TS>
    33<TS version="2.1" language="de_CH" sourcelanguage="en">
     4<context>
     5    <name>BaseSMSSendTask</name>
     6    <message>
     7        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
     8        <translation type="unfinished">Dr SMS-Versandt isch abbroche worde. E Teil vom SMS isch abr zu däm Zitpunkt scho versändet worde.</translation>
     9    </message>
     10</context>
    411<context>
    512    <name>QObject</name>
     
    1724    <message>
    1825        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
    19         <translation>Dr SMS-Versandt isch abbroche worde. E Teil vom SMS isch abr zu däm Zitpunkt scho versändet worde.</translation>
     26        <translation type="vanished">Dr SMS-Versandt isch abbroche worde. E Teil vom SMS isch abr zu däm Zitpunkt scho versändet worde.</translation>
    2027    </message>
    2128</context>
  • gateways/Sunrise/locale/fr.ts

    r337 r364  
    22<!DOCTYPE TS>
    33<TS version="2.1" language="fr" sourcelanguage="en">
     4<context>
     5    <name>BaseSMSSendTask</name>
     6    <message>
     7        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
     8        <translation type="unfinished">L&apos;envoi du SMS a été demandé d&apos;annuler, mais (une partie) des sms a déjà été envoyé.</translation>
     9    </message>
     10</context>
    411<context>
    512    <name>QObject</name>
     
    1724    <message>
    1825        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
    19         <translation>L&apos;envoi du SMS a été demandé d&apos;annuler, mais (une partie) des sms a déjà été envoyé.</translation>
     26        <translation type="vanished">L&apos;envoi du SMS a été demandé d&apos;annuler, mais (une partie) des sms a déjà été envoyé.</translation>
    2027    </message>
    2128</context>
  • gateways/Sunrise/locale/it.ts

    r337 r364  
    22<!DOCTYPE TS>
    33<TS version="2.1">
     4<context>
     5    <name>BaseSMSSendTask</name>
     6    <message>
     7        <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
     8        <translation type="unfinished"></translation>
     9    </message>
     10</context>
    411<context>
    512    <name>QObject</name>
     
    1421</context>
    1522<context>
    16     <name>Sunrise::BaseSMSSendTask</name>
    17     <message>
    18         <source>The sending of the sms was requested to cancel, but (a part of) the sms has already been sent.</source>
    19         <translation type="unfinished"></translation>
    20     </message>
    21 </context>
    22 <context>
    2323    <name>Sunrise::HttpHelper</name>
    2424    <message>
  • gateways/Sunrise/persistence/accountstoragehelper.cpp

    r330 r364  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #include "persistence/accountstoragehelper.h"
     18#include "accountstoragehelper.h"
    1919
    20 #include "business/account.h"
     20#include "gateways/Sunrise/business/account.h"
    2121
    2222namespace Sunrise {
  • gateways/Sunrise/sunrise-base.pro

    r350 r364  
    1 include(../../smssender.pri)
     1include(../../locale-base.pri)
    22include(sunrise.pri)
    33
    4 BASE_VERSION = 2.0
    5 
    6 TARGET = sunrise-base
    7 
    8 TEMPLATE = lib
    9 CONFIG += \
    10     staticlib
    11 
    12 QT = \
     4QT += \
    135    core \
    146    network \
     
    1911}
    2012
    21 LIBS += \
    22     -L../../ -l$$COMMON$$LIB_SUFFIX \
    23     -L../../ -lgateways-common$$LIB_SUFFIX
    24 
    25 # Needed so that this target gets rebuilt if they change,
    26 PRE_TARGETDEPS += \
    27     ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    28     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    29 
    30 install_dev_files:unix {
    31     target.path = /usr/lib/smssender/gateways
    32     INSTALLS += target
    33 }
    34 
    35 HEADERS = \
     13HEADERS += \
     14    business/account.h \
     15    business/account_tasks.h \
     16    business/account_tasks_base.h \
    3617    business/contactimporter/contactimporter.h \
    3718    business/gateway.h \
    3819    network/httphelper.h \
    3920    persistence/accountstoragehelper.h \
    40     business/account_tasks_base.h \
    41     business/account_tasks.h \
    42     business/account.h \
    4321
    44 SOURCES = \
     22SOURCES += \
    4523    business/account.cpp \
    4624    business/account_costs.cpp \
    47     business/account_task_login.cpp \
    48     business/account_task_sendsms.cpp \
     25    business/account_task_login_base.cpp \
     26    business/account_task_sendsms_base.cpp \
    4927    business/contactimporter/contactimporter.cpp \
    5028    business/gateway.cpp \
    5129    network/httphelper.cpp \
    52     persistence/accountstoragehelper.cpp
     30    persistence/accountstoragehelper.cpp \
    5331
    54 RESOURCES = \
     32RESOURCES += \
    5533    lib/sunrise.qrc
    5634
    57 install_dev_files:unix {
     35install-dev-files:unix {
    5836    ADDITIONAL_INSTALLS = $$HEADERS
    5937    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/gateways/Sunrise
  • gateways/Sunrise/sunrise.pro

    r333 r364  
    11TEMPLATE = subdirs
    22
    3 SUBDIRS = sunrise-base
    4 sunrise-base.file = sunrise-base.pro
    5 
    6 contains(DEFINES, FRONTEND_GUI) {
    7     SUBDIRS += sunrise-gui
    8 
    9     sunrise-gui.file = gui/sunrise-gui.pro
    10     sunrise-gui.depends = sunrise-base
     3your-princess-is-in-another-castle {
     4    SUBDIRS = sunrise-base
     5    sunrise-base.file = sunrise-base.pro
    116}
    127
     8build-frontend-gui {
     9    SUBDIRS += sunrise-gui
     10    sunrise-gui.file = gui/sunrise-gui.pro
     11}
     12
  • gateways/common/gateways-common-base.pro

    r356 r364  
    1 include(../../smssender.pri)
     1include(../../locale-base.pri)
    22
    3 TEMPLATE = lib
    43CONFIG +=\
    54    exceptions \
    65    thread \
    76    rtti
    8 DESTDIR = ../../
    9 TARGET = gateways-common
    10 QMAKE_CLEAN += $$DESTDIR/lib$$TARGET*
    11 QT = \
     7
     8QT += \
    129    core \
    1310    network \
     
    1613DEFINES += GATEWAYS_COMMON_LIBRARY
    1714
    18 LIBS += \
    19     -L../../$$COMMON$$LIB_SUFFIX
    20 
    21 # Needed so that this target gets rebuilt if they change,
    22 PRE_TARGETDEPS += \
    23     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    24 
    25 unix {
    26     target.path = /usr/lib/smssender
    27     INSTALLS += target
    28 }
    29 
    30 HEADERS = \
     15HEADERS += \
    3116    business/baseaccount.h \
    3217    business/baseaccount_tasks.h \
     
    3722    persistence/defaultaccountstoragehelper.h
    3823
    39 SOURCES = \
     24SOURCES += \
    4025    business/baseaccount.cpp \
    4126    business/baseaccount_tasks.cpp \
     
    4429    persistence/defaultaccountstoragehelper.cpp
    4530
    46 RESOURCES = \
     31RESOURCES += \
    4732    lib/gateways-common.qrc
    4833
    49 install_dev_files:unix {
    50     ADDITIONAL_INSTALLS = $$HEADERS ../*.pri
     34install-dev-files:unix {
     35    ADDITIONAL_INSTALLS = ../*.pri $$HEADERS
    5136    ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/gateways/common
    5237    include(../../additional_installs.pri)
  • gateways/common/gateways-common.pro

    r356 r364  
    1 include(../../smssender.pri)
     1TEMPLATE = subdirs
    22
    3 TEMPLATE = lib
    4 CONFIG +=\
    5     exceptions \
    6     thread \
    7     rtti
    8 DESTDIR = ../../
    9 TARGET = gateways-common
    10 QMAKE_CLEAN += $$DESTDIR/lib$$TARGET*
    11 QT = \
    12     core \
    13     network \
    14     sql
    15 
    16 DEFINES += GATEWAYS_COMMON_LIBRARY
    17 
    18 LIBS += \
    19     -L../../$$COMMON$$LIB_SUFFIX
    20 
    21 # Needed so that this target gets rebuilt if they change,
    22 PRE_TARGETDEPS += \
    23     ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    24 
    25 unix {
    26     target.path = /usr/lib/smssender
    27     INSTALLS += target
     3your-princess-is-in-another-castle {
     4    SUBDIRS += gateways-common-base
     5    gateways-common-base.file = gateways-common-base.pro
    286}
    297
    30 HEADERS = \
    31     business/baseaccount.h \
    32     business/baseaccount_tasks.h \
    33     business/baseaccount_utils.h \
    34     business/baselibrary.h \
    35     business/defaultlogininittask.h \
    36     global.h \
    37     persistence/defaultaccountstoragehelper.h
    38 
    39 SOURCES = \
    40     business/baseaccount.cpp \
    41     business/baseaccount_tasks.cpp \
    42     business/baselibrary.cpp \
    43     business/defaultlogininittask.cpp \
    44     persistence/defaultaccountstoragehelper.cpp
    45 
    46 RESOURCES = \
    47     lib/gateways-common.qrc
    48 
    49 install_dev_files:unix {
    50     ADDITIONAL_INSTALLS = $$HEADERS ../*.pri
    51     ADDITIONAL_INSTALLS_BASE = /usr/include/smssender/gateways/common
    52     include(../../additional_installs.pri)
     8build-frontend-gui {
     9    SUBDIRS += gateways-common-gui
     10    gateways-common-gui.file = gui/gateways-common-gui.pro
    5311}
  • gateways/gateways.pri

    r341 r364  
    11# Only dynamic gateway libraries should include this file.
    22# It is assumed, that they live in a directory [gateway]/[frontend-type]/
    3 
    4 include(../smssender.pri)
    53
    64TEMPLATE = lib
     
    1614    thread
    1715
    18 DESTDIR = ../
     16DESTDIR = ../../
    1917
    2018unix {
     
    2321}
    2422
     23contains(DEFINES, FRONTEND_GUI) {
     24    FRONTEND_SUFFIX=gui
     25} else {
     26    error("No frontend defined.")
     27}
     28
    2529LIBS += \
    26     -L../../../ -l$$COMMON$$LIB_SUFFIX \
    27     -L../../../ -lgateways-common$$LIB_SUFFIX
     30    -L../../../ -lcommon-$$FRONTEND_SUFFIX$$LIB_SUFFIX \
     31    -L../../../ -lgateways-common-$$FRONTEND_SUFFIX$$LIB_SUFFIX
     32
    2833unix {
    2934    # for the case that the dev-package is installed
     
    3338# Needed so that this target gets rebuilt if they change,
    3439PRE_TARGETDEPS += \
    35     ../../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    36     ../../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     40    ../../../libcommon-$$FRONTEND_SUFFIX$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
     41    ../../../libgateways-common-$$FRONTEND_SUFFIX$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
  • locale.pri

    r338 r364  
    1 TRANSLATIONS += \
    2     locale/de.ts \
    3     locale/de_CH.ts \
    4     locale/fr.ts \
    5     locale/it.ts
     1include(locale-base.pri)
    62
    73# Automatically compile the .ts files into .qm
  • smssender.pri

    r341 r364  
    1 BASE_VERSION = 3.0
     1include(smssender.prf)
    22
    3 DEVELOPMENT_VERSION = 1 # 0=alpha; 1=beta; 2=rc; 3=release
    4 VERSION_REVISION = 6
     3BASE_VERSION = 3.1
     4
     5DEVELOPMENT_VERSION = 3 # 0=alpha; 1=beta; 2=rc; 3=release
     6VERSION_REVISION = 0
    57
    68VERSION = $${BASE_VERSION}.$${DEVELOPMENT_VERSION}.$${VERSION_REVISION}
     
    1214INCLUDEPATH += $$PWD
    1315
    14 contains(DEFINES, FRONTEND_GUI) {
    15     COMMON=common-gui
    16 }
     16QT =
    1717
    1818LIB_SUFFIX=
Note: See TracChangeset for help on using the changeset viewer.