Changeset 94:9b067b959ed9 in SMSSender


Ignore:
Timestamp:
Jul 2, 2010 11:18:21 PM (8 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
3.0
Convert:
svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@97
Message:
  • Started contact import. Import of contacts from older version is already possible.
Files:
25 added
15 edited

Legend:

Unmodified
Added
Removed
  • deploy/ubuntu/smssender-gateway-swisscomxtrazone/debian/changelog

    r92 r94  
     1smssender-gateway-swisscomxtrazone (1.0.0.alpha2-0ubuntu2) lucid; urgency=low
     2
     3  * Packaging error lead to missing plugin file.
     4
     5 -- Sämy Zehnder <saemy.zehnder@gorrion.ch>  Mon, 28 Jun 2010 13:53:17 +0200
     6
    17smssender-gateway-swisscomxtrazone (1.0.0.alpha2-0ubuntu1) lucid; urgency=low
    28
    39  * Renamed package.
    4   * The login is now done via the customer page since there does not exist a anticaptcha system.
     10  * The login is now done via the customer page since there does not exist a
     11    anticaptcha system.
    512
    613 -- Sämy Zehnder <saemy.zehnder@gorrion.ch>  Mon, 28 Jun 2010 12:34:49 +0200
  • deploy/ubuntu/smssender-gateway-swisscomxtrazone/debian/rules

    r92 r94  
    6464        dh_installdirs
    6565
    66         $(MAKE) -C `pwd`/gateways/SwisscomXtraZone INSTALL_ROOT=`pwd`/debian/smssender-swisscomxtrazone install
     66        $(MAKE) -C `pwd`/gateways/SwisscomXtraZone INSTALL_ROOT=`pwd`/debian/smssender-gateway-swisscomxtrazone install
    6767
    6868        dh_install
  • gateways/SwisscomXtraZone/swisscomxtrazone.pro

    r92 r94  
    1 VERSION = 1.0.0.0
     1VERSION = 1.0.0.2
    22DEFINES += LIB_VERSION=\\\"$$VERSION\\\"
    33TEMPLATE = lib
  • lib/libdatatypes/libdatatypes.pro

    r92 r94  
    22# Increase this, if interfaces in libdatatypes have changed.
    33DEFINES += LIBDATATYPES_COMPATIBILITY_VERSION=1
    4 #
    54VERSION = 2.0.0
    65TEMPLATE = lib
     
    6261    src/exceptions/persistence/storageexceptions.h \
    6362    src/interfaces/iaccount.h \
     63    src/interfaces/icontactimporter.h \
    6464    src/interfaces/igateway.h \
    6565    src/interfaces/iinterface.h \
     
    8585    src/validation/sstdaccountvalidator.h \
    8686    src/validation/svalidationresult.h
    87 SOURCES +=src/scontact.cpp \
     87SOURCES += src/scontact.cpp \
    8888    src/sdummyaccount.cpp \
    8989    src/sgroup.cpp \
  • lib/resource.qrc

    r87 r94  
    11<RCC>
    2     <qresource prefix="/ico">
    3         <file>edit.png</file>
    4         <file>sms_new.png</file>
    5         <file>blank.png</file>
    6         <file>navigate_right.png</file>
    7         <file>navigate_left.png</file>
    8         <file>address_book.png</file>
    9         <file>replace.png</file>
    10         <file>photo_portrait.png</file>
    11         <file>user.png</file>
    12         <file>heart.png</file>
    13         <file>close_cancel.png</file>
    14         <file>add.png</file>
    15         <file>remove.png</file>
    16         <file>refresh.png</file>
    17         <file>components.png</file>
    18         <file>users.png</file>
    19         <file>keyboard_key.png</file>
    20         <file>client_network.png</file>
    21         <file>gears.png</file>
    22         <file>preferences.png</file>
    23         <file>about.png</file>
    24         <file>exit.png</file>
    25         <file>smssender.png</file>
    26     </qresource>
    27     <qresource prefix="/img">
    28         <file>gorrion_logo.png</file>
    29     </qresource>
    30     <qresource prefix="/locale">
    31         <file>de.qm</file>
    32     </qresource>
     2  <qresource prefix="/ico">
     3    <file>edit.png</file>
     4    <file>import.png</file>
     5    <file>sms_new.png</file>
     6    <file>blank.png</file>
     7    <file>navigate_right.png</file>
     8    <file>navigate_left.png</file>
     9    <file>address_book.png</file>
     10    <file>replace.png</file>
     11    <file>photo_portrait.png</file>
     12    <file>user.png</file>
     13    <file>heart.png</file>
     14    <file>close_cancel.png</file>
     15    <file>add.png</file>
     16    <file>remove.png</file>
     17    <file>refresh.png</file>
     18    <file>components.png</file>
     19    <file>users.png</file>
     20    <file>keyboard_key.png</file>
     21    <file>client_network.png</file>
     22    <file>gears.png</file>
     23    <file>preferences.png</file>
     24    <file>about.png</file>
     25    <file>exit.png</file>
     26    <file>smssender.png</file>
     27  </qresource>
     28  <qresource prefix="/img">
     29    <file>gorrion_logo.png</file>
     30  </qresource>
     31  <qresource prefix="/locale">
     32    <file>de.qm</file>
     33  </qresource>
    3334</RCC>
  • locale/de.ts

    r92 r94  
    55    <name>AbstractAccount</name>
    66    <message>
    7         <location filename="../lib/libdatatypes/src/abstract/abstractaccount.cpp" line="191"/>
     7        <location filename="../lib/libdatatypes/src/abstract/abstractaccount.cpp" line="207"/>
    88        <source>Unknown exception occured during initializing.</source>
    99        <translation>Beim Initializieren trat ein unbekannter Fehler auf.</translation>
    1010    </message>
    1111    <message>
    12         <location filename="../lib/libdatatypes/src/abstract/abstractaccount.cpp" line="261"/>
     12        <location filename="../lib/libdatatypes/src/abstract/abstractaccount.cpp" line="277"/>
    1313        <source>Unknown exception occured during sending the sms.</source>
    1414        <translation>Ein unbekannter Fehler trat während dem Senden des SMS auf.</translation>
     
    1818    <name>AbstractAccountStorageOfficer</name>
    1919    <message>
    20         <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="23"/>
     20        <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="39"/>
    2121        <source>Could not create the account table in the database.</source>
    2222        <translation>Konnte die Tabellendefinitionen für die Kontensicherung nicht in die Datenbank schreiben.</translation>
    2323    </message>
    2424    <message>
    25         <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="36"/>
     25        <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="52"/>
    2626        <source>No such account in the database!</source>
    2727        <translation>Der Dienst konnte in der Datenbank nicht gefunden werden!</translation>
    2828    </message>
    2929    <message>
    30         <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="62"/>
    31         <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="73"/>
    32         <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="91"/>
     30        <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="78"/>
     31        <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="89"/>
     32        <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="107"/>
    3333        <source>The account could not have been written to the database.</source>
    3434        <translation>Die Konteninformationen konnten nicht in die Datenbank geschrieben werden.</translation>
    3535    </message>
    3636    <message>
    37         <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="107"/>
     37        <location filename="../lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp" line="123"/>
    3838        <source>Could not remove the account from the database.</source>
    3939        <translation>Konnte das Konto nicht aus der Datenbank entfernen.</translation>
     
    4343    <name>AccountTreeModel</name>
    4444    <message>
    45         <location filename="../src/ui/models/accounttreemodel.cpp" line="58"/>
     45        <location filename="../src/ui/models/accounttreemodel.cpp" line="68"/>
    4646        <source>Name</source>
    4747        <translation>Name</translation>
    4848    </message>
    4949    <message>
    50         <location filename="../src/ui/models/accounttreemodel.cpp" line="59"/>
     50        <location filename="../src/ui/models/accounttreemodel.cpp" line="69"/>
    5151        <source>Name (Free messages)</source>
    5252        <translation>Name (Gratis-SMS)</translation>
    5353    </message>
    5454    <message>
    55         <location filename="../src/ui/models/accounttreemodel.cpp" line="60"/>
     55        <location filename="../src/ui/models/accounttreemodel.cpp" line="70"/>
    5656        <source>Gateway</source>
    5757        <translation>Dienst</translation>
    5858    </message>
    5959    <message>
    60         <location filename="../src/ui/models/accounttreemodel.cpp" line="61"/>
     60        <location filename="../src/ui/models/accounttreemodel.cpp" line="71"/>
    6161        <source>Enabled</source>
    6262        <translation>Aktiviert</translation>
     
    7474    <name>ContactTableModel</name>
    7575    <message>
    76         <location filename="../src/ui/models/contacttablemodel.cpp" line="50"/>
     76        <location filename="../src/ui/models/contacttablemodel.cpp" line="62"/>
    7777        <source>Name</source>
    7878        <translation>Name</translation>
    7979    </message>
    8080    <message>
    81         <location filename="../src/ui/models/contacttablemodel.cpp" line="51"/>
     81        <location filename="../src/ui/models/contacttablemodel.cpp" line="63"/>
    8282        <source>Number</source>
    8383        <translation>Nummer</translation>
    8484    </message>
    8585    <message>
    86         <location filename="../src/ui/models/contacttablemodel.cpp" line="52"/>
     86        <location filename="../src/ui/models/contacttablemodel.cpp" line="64"/>
    8787        <source>Aliases</source>
    8888        <translation>Aliasse</translation>
     
    9292    <name>DAAccountListManager</name>
    9393    <message>
    94         <location filename="../src/persistence/storage/DAAccountListManager.cpp" line="32"/>
     94        <location filename="../src/persistence/storage/daaccountlistmanager.cpp" line="42"/>
    9595        <source>No such account in the database!</source>
    9696        <translation>Der Dienst konnte in der Datenbank nicht gefunden werden!</translation>
    9797    </message>
    9898    <message>
    99         <location filename="../src/persistence/storage/DAAccountListManager.cpp" line="44"/>
     99        <location filename="../src/persistence/storage/daaccountlistmanager.cpp" line="54"/>
    100100        <source>The gateway could not have been found.</source>
    101101        <translation>Das Konto konnte nicht gefunden werden.</translation>
     
    109109    <name>DASettings</name>
    110110    <message>
    111         <location filename="../src/persistence/DASettings.cpp" line="75"/>
     111        <location filename="../src/persistence/dasettings.cpp" line="89"/>
    112112        <source>Ctrl+N</source>
    113113        <comment>SendMessage</comment>
     
    115115    </message>
    116116    <message>
    117         <location filename="../src/persistence/DASettings.cpp" line="79"/>
     117        <location filename="../src/persistence/dasettings.cpp" line="93"/>
    118118        <source>Ctrl+Alt+N</source>
    119119        <comment>ClearMessageText</comment>
     
    121121    </message>
    122122    <message>
    123         <location filename="../src/persistence/DASettings.cpp" line="83"/>
     123        <location filename="../src/persistence/dasettings.cpp" line="97"/>
    124124        <source>Ctrl+Alt+Shift+N</source>
    125125        <comment>ClearRecipients</comment>
     
    127127    </message>
    128128    <message>
    129         <location filename="../src/persistence/DASettings.cpp" line="87"/>
     129        <location filename="../src/persistence/dasettings.cpp" line="101"/>
    130130        <source>Ctrl+S</source>
    131131        <comment>SendMessage</comment>
     
    136136    <name>DAStorage</name>
    137137    <message>
    138         <location filename="../src/persistence/storage/DAStorage.cpp" line="41"/>
     138        <location filename="../src/persistence/storage/dastorage.cpp" line="52"/>
    139139        <source>Can&apos;t open the database!</source>
    140140        <translation>Konnte keine Verbindung zur Datenbank herstellen!</translation>
    141141    </message>
    142142    <message>
    143         <location filename="../src/persistence/storage/DAStorage.cpp" line="253"/>
     143        <location filename="../src/persistence/storage/dastorage.cpp" line="264"/>
    144144        <source>Could not write setting to the database.</source>
    145145        <translation>Konnte eine Einstellung nicht in die Datenbank schreiben.</translation>
    146146    </message>
    147147    <message>
    148         <location filename="../src/persistence/storage/DAStorage.cpp" line="70"/>
     148        <location filename="../src/persistence/storage/dastorage.cpp" line="81"/>
    149149        <source>Could not write the table definitions to the database</source>
    150150        <translation>Konnte die Tabellendefinitionen nicht in die Datenbank schreiben</translation>
    151151    </message>
    152152    <message>
    153         <location filename="../src/persistence/storage/DAStorage.cpp" line="146"/>
     153        <location filename="../src/persistence/storage/dastorage.cpp" line="157"/>
    154154        <source>No such contact in the database!</source>
    155155        <translation>Der Kontakt konnte in der Datenbank nicht gefunden werden!</translation>
    156156    </message>
    157157    <message>
    158         <location filename="../src/persistence/storage/DAStorage.cpp" line="172"/>
     158        <location filename="../src/persistence/storage/dastorage.cpp" line="183"/>
    159159        <source>No such group in the database!</source>
    160160        <translation>Die Gruppe konnte in der Datenbank nicht gefunden werden!</translation>
    161161    </message>
    162162    <message>
    163         <location filename="../src/persistence/storage/DAStorage.cpp" line="279"/>
     163        <location filename="../src/persistence/storage/dastorage.cpp" line="290"/>
    164164        <source>Could not write an encrypted string to the database - maximum attemps reached.</source>
    165165        <translation>Konnte einen verschlüsselten Wert nicht in die Datenbank schreiben - die maximale Versuchsanzahl wurde erreicht.</translation>
    166166    </message>
    167167    <message>
    168         <location filename="../src/persistence/storage/DAStorage.cpp" line="322"/>
    169         <location filename="../src/persistence/storage/DAStorage.cpp" line="333"/>
    170         <location filename="../src/persistence/storage/DAStorage.cpp" line="350"/>
     168        <location filename="../src/persistence/storage/dastorage.cpp" line="333"/>
     169        <location filename="../src/persistence/storage/dastorage.cpp" line="344"/>
     170        <location filename="../src/persistence/storage/dastorage.cpp" line="361"/>
    171171        <source>The contact could not have been written to the database.</source>
    172172        <translation>Der Kontakt konnte nicht in die Datenbank geschrieben werden.</translation>
    173173    </message>
    174174    <message>
    175         <location filename="../src/persistence/storage/DAStorage.cpp" line="381"/>
    176         <location filename="../src/persistence/storage/DAStorage.cpp" line="392"/>
    177         <location filename="../src/persistence/storage/DAStorage.cpp" line="407"/>
     175        <location filename="../src/persistence/storage/dastorage.cpp" line="392"/>
     176        <location filename="../src/persistence/storage/dastorage.cpp" line="403"/>
     177        <location filename="../src/persistence/storage/dastorage.cpp" line="418"/>
    178178        <source>The group could not have been written to the database.</source>
    179179        <translation>Die Gruppe konnte nicht in die Datenbank geschrieben werden.</translation>
    180180    </message>
    181181    <message>
    182         <location filename="../src/persistence/storage/DAStorage.cpp" line="439"/>
     182        <location filename="../src/persistence/storage/dastorage.cpp" line="450"/>
    183183        <source>Could not remove the setting from the database.</source>
    184184        <translation>Konnte eine Einstellung nicht aus der Datenbank entfernen.</translation>
    185185    </message>
    186186    <message>
    187         <location filename="../src/persistence/storage/DAStorage.cpp" line="452"/>
     187        <location filename="../src/persistence/storage/dastorage.cpp" line="463"/>
    188188        <source>Could not remove the settings from the database.</source>
    189189        <translation>Konnte die Einstellungen nicht aus der Datenbank entfernen.</translation>
    190190    </message>
    191191    <message>
    192         <location filename="../src/persistence/storage/DAStorage.cpp" line="473"/>
     192        <location filename="../src/persistence/storage/dastorage.cpp" line="484"/>
    193193        <source>Could not remove the contact from the database</source>
    194194        <translation>Konnte den Kontakt nicht aus der Datenbank entfernen</translation>
    195195    </message>
    196196    <message>
    197         <location filename="../src/persistence/storage/DAStorage.cpp" line="493"/>
     197        <location filename="../src/persistence/storage/dastorage.cpp" line="504"/>
    198198        <source>Could not remove the group from the database</source>
    199199        <translation>Konnte die Gruppe nicht aus der Datenbank entfernen</translation>
     
    203203    <name>GroupTableModel</name>
    204204    <message>
    205         <location filename="../src/ui/models/grouptablemodel.cpp" line="49"/>
     205        <location filename="../src/ui/models/grouptablemodel.cpp" line="61"/>
    206206        <source>Name</source>
    207207        <translation>Name</translation>
    208208    </message>
    209209    <message>
    210         <location filename="../src/ui/models/grouptablemodel.cpp" line="50"/>
     210        <location filename="../src/ui/models/grouptablemodel.cpp" line="62"/>
    211211        <source>Members</source>
    212212        <translation>Mitglieder</translation>
     
    216216    <name>QObject</name>
    217217    <message>
    218         <location filename="../lib/libdatatypes/src/abstract/abstractloginaccount.cpp" line="3"/>
     218        <location filename="../lib/libdatatypes/src/abstract/abstractloginaccount.cpp" line="20"/>
    219219        <source>Logging in</source>
    220220        <translation>Am Anmelden</translation>
    221221    </message>
    222222    <message>
    223         <location filename="../lib/libdatatypes/src/abstract/abstractloginaccount.cpp" line="4"/>
     223        <location filename="../lib/libdatatypes/src/abstract/abstractloginaccount.cpp" line="21"/>
    224224        <source>Logging out</source>
    225225        <translation>Am Abmelden</translation>
    226226    </message>
    227227    <message>
    228         <location filename="../lib/libdatatypes/src/exceptions/eexception.cpp" line="104"/>
    229         <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="64"/>
    230         <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="61"/>
     228        <location filename="../lib/libdatatypes/src/exceptions/eexception.cpp" line="114"/>
     229        <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="74"/>
     230        <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="71"/>
    231231        <source>Unknown error</source>
    232232        <translation>Unbekannter Fehler</translation>
    233233    </message>
    234234    <message>
    235         <location filename="../lib/libdatatypes/src/exceptions/eexception.cpp" line="121"/>
     235        <location filename="../lib/libdatatypes/src/exceptions/eexception.cpp" line="131"/>
    236236        <source>There is no chained exception!</source>
    237237        <translation>An diesen Fehler ist kein weiterer angehängt!</translation>
    238238    </message>
    239239    <message>
    240         <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="52"/>
     240        <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="62"/>
    241241        <source>Loading the library failed: </source>
    242242        <translation>Fehler beim Laden der Bibliothek: </translation>
    243243    </message>
    244244    <message>
    245         <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="55"/>
     245        <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="65"/>
    246246        <source>Could not find the file</source>
    247247        <translation>Konnte die Datei nicht finden</translation>
    248248    </message>
    249249    <message>
    250         <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="57"/>
     250        <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="67"/>
    251251        <source>The given file is no library</source>
    252252        <translation>Die gegebene Datei ist keine Bibliothek</translation>
    253253    </message>
    254254    <message>
    255         <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="59"/>
     255        <location filename="../lib/libdatatypes/src/exceptions/elibraryloadexception.cpp" line="69"/>
    256256        <source>The given library has an invalid version</source>
    257257        <translation>Die gegebene Bibliothek hat eine falsche Version</translation>
    258258    </message>
    259259    <message>
    260         <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="51"/>
     260        <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="61"/>
    261261        <source>Login failed: </source>
    262262        <translation>Anmelden fehlgeschlagen: </translation>
    263263    </message>
    264264    <message>
    265         <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="54"/>
     265        <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="64"/>
    266266        <source>Request error</source>
    267267        <translation>Anfragefehler</translation>
    268268    </message>
    269269    <message>
    270         <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="56"/>
     270        <location filename="../lib/libdatatypes/src/exceptions/eloginaccountloginexception.cpp" line="66"/>
    271271        <source>Your login data might be wrong</source>
    272272        <translation>Die Logininformationen (Benutzername/Passwort) sind womöglich falsch</translation>
    273273    </message>
    274274    <message>
    275         <location filename="../lib/libdatatypes/src/exceptions/httpexceptions.cpp" line="51"/>
     275        <location filename="../lib/libdatatypes/src/exceptions/httpexceptions.cpp" line="61"/>
    276276        <source>SSL-Errors: </source>
    277277        <translation>SSL-Fehler: </translation>
    278278    </message>
    279279    <message>
    280         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="10"/>
     280        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="20"/>
    281281        <source>Sleeping</source>
    282282        <translation>Schlafe</translation>
    283283    </message>
    284284    <message>
    285         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="12"/>
     285        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="22"/>
    286286        <source>Initializing</source>
    287287        <translation>Initializiere</translation>
    288288    </message>
    289289    <message>
    290         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="13"/>
     290        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="23"/>
    291291        <source>Aborting initialization</source>
    292292        <translation>Initializierung wird abgebrochen</translation>
    293293    </message>
    294294    <message>
    295         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="15"/>
     295        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="25"/>
    296296        <source>Adding recipients</source>
    297297        <translation>Empfänger wird hinzugefügt</translation>
    298298    </message>
    299299    <message>
    300         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="16"/>
     300        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="26"/>
    301301        <source>Removing old recipients</source>
    302302        <translation>Alte Empfänger werden entfernt</translation>
    303303    </message>
    304304    <message>
    305         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="17"/>
     305        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="27"/>
    306306        <source>Sending sms</source>
    307307        <translation>Sende SMS</translation>
    308308    </message>
    309309    <message>
    310         <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="18"/>
     310        <location filename="../lib/libdatatypes/src/interfaces/iaccount.cpp" line="28"/>
    311311        <source>Cancelling sms sending</source>
    312312        <translation>Der SMS-Versand wird abgebrochen</translation>
    313313    </message>
    314314    <message>
    315         <location filename="../lib/libdatatypes/src/validation/sstdaccountvalidator.cpp" line="20"/>
     315        <location filename="../lib/libdatatypes/src/validation/sstdaccountvalidator.cpp" line="30"/>
    316316        <source>The name of the account can&apos;t be empty.</source>
    317317        <translation>Der Name des Kontos kann nicht leer sein.</translation>
    318318    </message>
     319    <message>
     320        <location filename="../src/business/bcoldsettingscontactimporter.cpp" line="28"/>
     321        <source>Import contacts from older versions of smssender.</source>
     322        <translation>Importiere Kontakte von älteren SMSSender-Versionen.</translation>
     323    </message>
    319324</context>
    320325<context>
    321326    <name>SHttpHelper</name>
    322327    <message>
    323         <location filename="../lib/libdatatypes/src/shttphelper.cpp" line="262"/>
     328        <location filename="../lib/libdatatypes/src/shttphelper.cpp" line="279"/>
    324329        <source>Unknown response code: %1</source>
    325330        <translation>Unbekannter Antwort-Code: %1</translation>
     
    329334    <name>SLoginAccountValidator</name>
    330335    <message>
    331         <location filename="../lib/libdatatypes/src/validation/sloginaccountvalidator.cpp" line="18"/>
     336        <location filename="../lib/libdatatypes/src/validation/sloginaccountvalidator.cpp" line="28"/>
    332337        <source>The username can&apos;t be empty.</source>
    333338        <translation>Der Benuthername kann nicht leer sein.</translation>
    334339    </message>
    335340    <message>
    336         <location filename="../lib/libdatatypes/src/validation/sloginaccountvalidator.cpp" line="22"/>
     341        <location filename="../lib/libdatatypes/src/validation/sloginaccountvalidator.cpp" line="32"/>
    337342        <source>The password can&apos;t be empty.</source>
    338343        <translation>Das Passwort kann nicht leer sein.</translation>
     
    381386    <name>VCAccountList</name>
    382387    <message>
    383         <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="87"/>
     388        <location filename="../src/ui/vcaccountlist/vcaccountlist.cpp" line="116"/>
    384389        <source>SMSSender</source>
    385390        <translation>SMSSender</translation>
    386391    </message>
    387392    <message>
    388         <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="88"/>
     393        <location filename="../src/ui/vcaccountlist/vcaccountlist.cpp" line="117"/>
    389394        <source>Do you really want to remove this account?</source>
    390395        <translation>Soll dieses Konto wirklich entfernt werden?</translation>
     
    394399    <name>VCAccountListClass</name>
    395400    <message>
    396         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="14"/>
     401        <location filename="../src/ui/vcaccountlist/vcaccountlist.ui" line="14"/>
    397402        <source>Accounts</source>
    398403        <translation>Konten</translation>
    399404    </message>
    400405    <message>
    401         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="26"/>
     406        <location filename="../src/ui/vcaccountlist/vcaccountlist.ui" line="26"/>
    402407        <source>Add new account</source>
    403408        <translation>Neues Konto hinzufügen</translation>
    404409    </message>
    405410    <message>
    406         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="46"/>
     411        <location filename="../src/ui/vcaccountlist/vcaccountlist.ui" line="46"/>
    407412        <source>Remove account</source>
    408413        <translation>Konto entfernen</translation>
    409414    </message>
    410415    <message>
    411         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="66"/>
     416        <location filename="../src/ui/vcaccountlist/vcaccountlist.ui" line="66"/>
    412417        <source>Edit account</source>
    413418        <translation>Konto bearbeiten</translation>
    414419    </message>
    415420    <message>
    416         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="105"/>
     421        <location filename="../src/ui/vcaccountlist/vcaccountlist.ui" line="105"/>
    417422        <source>Filter...</source>
    418423        <translation>Filter...</translation>
     
    422427    <name>VCAddressBook</name>
    423428    <message>
    424         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="151"/>
    425         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="186"/>
     429        <location filename="../src/ui/vcaddressbook/vcaddressbook_contact.cpp" line="79"/>
     430        <location filename="../src/ui/vcaddressbook/vcaddressbook_group.cpp" line="77"/>
    426431        <source>SMSSender</source>
    427432        <translation>SMSSender</translation>
    428433    </message>
    429434    <message>
    430         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="152"/>
     435        <location filename="../src/ui/vcaddressbook/vcaddressbook_contact.cpp" line="80"/>
    431436        <source>Do you really want to remove this contact?</source>
    432437        <translation>Soll dieser Kontakt wirklich gelöscht werden?</translation>
    433438    </message>
    434439    <message>
    435         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="187"/>
     440        <location filename="../src/ui/vcaddressbook/vcaddressbook_group.cpp" line="78"/>
    436441        <source>Do you really want to remove this group?</source>
    437442        <translation>Soll diese Gruppe wirklich gelöscht werden?</translation>
     
    441446    <name>VCAddressBookClass</name>
    442447    <message>
    443         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="17"/>
     448        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="17"/>
    444449        <source>Address Book</source>
    445450        <translation>Addressbuch</translation>
    446451    </message>
    447452    <message>
    448         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="50"/>
     453        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="50"/>
    449454        <source>Contacts</source>
    450455        <translation>Kontakte</translation>
    451456    </message>
    452457    <message>
    453         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="114"/>
    454         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="266"/>
     458        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="62"/>
     459        <source>Add a new contact.</source>
     460        <translation>Einen neuen Kontakt hinzufügen.</translation>
     461    </message>
     462    <message>
     463        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="82"/>
     464        <source>Remove the selected contact.</source>
     465        <translation>Entferne den angewählten Kontakt.</translation>
     466    </message>
     467    <message>
     468        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="102"/>
     469        <source>Edit the selected contact.</source>
     470        <translation>Bearbeite den angewählten Kontakt.</translation>
     471    </message>
     472    <message>
     473        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="138"/>
     474        <source>Import contacts.</source>
     475        <translation>Importiere Kontakte.</translation>
     476    </message>
     477    <message>
     478        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="244"/>
     479        <source>Add a new group.</source>
     480        <translation>Ein neues Konto hinzufügen.</translation>
     481    </message>
     482    <message>
     483        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="270"/>
     484        <source>Remove the selected group.</source>
     485        <translation>Entferne die angewählte Gruppe.</translation>
     486    </message>
     487    <message>
     488        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="296"/>
     489        <source>Edit the selected group.</source>
     490        <translation>Bearbeite die angewählte Gruppe.</translation>
     491    </message>
     492    <message>
     493        <source>Edit account</source>
     494        <translation type="obsolete">Konto bearbeiten</translation>
     495    </message>
     496    <message>
     497        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="177"/>
     498        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="335"/>
     499        <source>Filter...</source>
     500        <translation>Filter...</translation>
     501    </message>
     502    <message>
     503        <location filename="../src/ui/vcaddressbook/vcaddressbook.ui" line="226"/>
     504        <source>Groups</source>
     505        <translation>Gruppen</translation>
     506    </message>
     507</context>
     508<context>
     509    <name>VCEditAccount</name>
     510    <message>
     511        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="50"/>
     512        <source>No gateway available</source>
     513        <translation>Kein Dienst vorhanden</translation>
     514    </message>
     515    <message>
     516        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="51"/>
     517        <source>You have not installed any gateway. Adding an account is impossible.</source>
     518        <translation>Es ist kein Dienst installiert. Das Hinzufügen eines Kontos ist deshalb nicht möglich.</translation>
     519    </message>
     520    <message>
     521        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="57"/>
     522        <source>Missing gateway</source>
     523        <translation>Dienst fehlt</translation>
     524    </message>
     525    <message>
     526        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="58"/>
     527        <source>You can&apos;t edit this account because its gateway has not been loaded.</source>
     528        <translation>Dieses Konto ist nicht editierbar, da dessen Dienst nicht installiert ist.</translation>
     529    </message>
     530    <message>
     531        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="142"/>
     532        <source>This account name is already in use.</source>
     533        <translation>Dieser Kontonamen existiert bereits.       </translation>
     534    </message>
     535    <message>
     536        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="150"/>
     537        <location filename="../src/ui/vceditaccount/vceditaccount.cpp" line="155"/>
     538        <source>SMSSender</source>
     539        <translation>SMSSender</translation>
     540    </message>
     541</context>
     542<context>
     543    <name>VCEditAccountClass</name>
     544    <message>
     545        <location filename="../src/ui/vceditaccount/vceditaccount.ui" line="14"/>
    455546        <source>Edit account</source>
    456547        <translation>Konto bearbeiten</translation>
    457548    </message>
    458549    <message>
    459         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="153"/>
    460         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="305"/>
    461         <source>Filter...</source>
    462         <translation>Filter...</translation>
    463     </message>
    464     <message>
    465         <location filename="../src/ui/VCAddressBook/vcaddressbook.ui" line="202"/>
    466         <source>Groups</source>
    467         <translation>Gruppen</translation>
    468     </message>
    469 </context>
    470 <context>
    471     <name>VCEditAccount</name>
    472     <message>
    473         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="33"/>
    474         <source>No gateway available</source>
    475         <translation>Kein Dienst vorhanden</translation>
    476     </message>
    477     <message>
    478         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="34"/>
    479         <source>You have not installed any gateway. Adding an account is impossible.</source>
    480         <translation>Es ist kein Dienst installiert. Das Hinzufügen eines Kontos ist deshalb nicht möglich.</translation>
    481     </message>
    482     <message>
    483         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="40"/>
    484         <source>Missing gateway</source>
    485         <translation>Dienst fehlt</translation>
    486     </message>
    487     <message>
    488         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="41"/>
    489         <source>You can&apos;t edit this account because its gateway has not been loaded.</source>
    490         <translation>Dieses Konto ist nicht editierbar, da dessen Dienst nicht installiert ist.</translation>
    491     </message>
    492     <message>
    493         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="125"/>
    494         <source>This account name is already in use.</source>
    495         <translation>Dieser Kontonamen existiert bereits.       </translation>
    496     </message>
    497     <message>
    498         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="133"/>
    499         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="138"/>
     550        <location filename="../src/ui/vceditaccount/vceditaccount.ui" line="26"/>
     551        <source>Account information</source>
     552        <translation>Kontoinformationen</translation>
     553    </message>
     554    <message>
     555        <location filename="../src/ui/vceditaccount/vceditaccount.ui" line="32"/>
     556        <source>Name:</source>
     557        <translation>Name:</translation>
     558    </message>
     559    <message>
     560        <location filename="../src/ui/vceditaccount/vceditaccount.ui" line="45"/>
     561        <source>Gateway:</source>
     562        <translation>Dienst:</translation>
     563    </message>
     564    <message>
     565        <location filename="../src/ui/vceditaccount/vceditaccount.ui" line="68"/>
     566        <source>Account settings</source>
     567        <translation>Kontoeinstellungen</translation>
     568    </message>
     569</context>
     570<context>
     571    <name>VCEditContact</name>
     572    <message>
     573        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="78"/>
     574        <source>Change icon</source>
     575        <translation>Bild ändern</translation>
     576    </message>
     577    <message>
     578        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="84"/>
     579        <source>Remove icon</source>
     580        <translation>Bild entfernen</translation>
     581    </message>
     582    <message>
     583        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="123"/>
     584        <source>Images</source>
     585        <translation>Bilder</translation>
     586    </message>
     587    <message>
     588        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="130"/>
     589        <source>Open File</source>
     590        <translation>Datei öffnen</translation>
     591    </message>
     592    <message>
     593        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="179"/>
     594        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="202"/>
    500595        <source>SMSSender</source>
    501596        <translation>SMSSender</translation>
    502597    </message>
    503 </context>
    504 <context>
    505     <name>VCEditAccountClass</name>
    506     <message>
    507         <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="14"/>
    508         <source>Edit account</source>
    509         <translation>Konto bearbeiten</translation>
    510     </message>
    511     <message>
    512         <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="26"/>
    513         <source>Account information</source>
    514         <translation>Kontoinformationen</translation>
    515     </message>
    516     <message>
    517         <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="32"/>
     598    <message>
     599        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="180"/>
     600        <source>This contact is already known under this alias.</source>
     601        <translation>Diesem Kontakt wurde dieser Alias bereits zugewiesen.</translation>
     602    </message>
     603    <message>
     604        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="203"/>
     605        <source>Do you really want to remove this alias?</source>
     606        <translation>Soll dieser Alias wirklich entfernt werden?</translation>
     607    </message>
     608    <message>
     609        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="222"/>
     610        <source>Please enter a name for this contact.</source>
     611        <translation>Der Name des Kontakts kann nicht leer sein.</translation>
     612    </message>
     613    <message>
     614        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="230"/>
     615        <source>The given phone number is not valid.</source>
     616        <translation>Die Telefonnummer ist ungültig.</translation>
     617    </message>
     618    <message>
     619        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="237"/>
     620        <source>&quot;%1&quot; is already in the adressbook with the same number.</source>
     621        <translation>&quot;%1&quot; ist bereits mit derselben Telefonnummer im Adressbuch eingetragen.</translation>
     622    </message>
     623    <message>
     624        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="267"/>
     625        <source>Some names of this contact are already in use:</source>
     626        <translation>Einige Namen werden bereits verwendet:</translation>
     627    </message>
     628    <message>
     629        <location filename="../src/ui/vceditcontact/vceditcontact.cpp" line="274"/>
     630        <source>Edit contact</source>
     631        <translation>Kontakt bearbeiten</translation>
     632    </message>
     633</context>
     634<context>
     635    <name>VCEditContactClass</name>
     636    <message>
     637        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="17"/>
     638        <source>Edit contact</source>
     639        <translation>Kontakt bearbeiten</translation>
     640    </message>
     641    <message>
     642        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="30"/>
     643        <source>Contact information</source>
     644        <translation>Kontaktinformationen</translation>
     645    </message>
     646    <message>
     647        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="36"/>
    518648        <source>Name:</source>
    519649        <translation>Name:</translation>
    520650    </message>
    521651    <message>
    522         <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="45"/>
    523         <source>Gateway:</source>
    524         <translation>Dienst:</translation>
    525     </message>
    526     <message>
    527         <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="68"/>
    528         <source>Account settings</source>
    529         <translation>Kontoeinstellungen</translation>
    530     </message>
    531 </context>
    532 <context>
    533     <name>VCEditContact</name>
    534     <message>
    535         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="60"/>
    536         <source>Change icon</source>
    537         <translation>Bild ändern</translation>
    538     </message>
    539     <message>
    540         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="66"/>
    541         <source>Remove icon</source>
    542         <translation>Bild entfernen</translation>
    543     </message>
    544     <message>
    545         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="105"/>
    546         <source>Images</source>
    547         <translation>Bilder</translation>
    548     </message>
    549     <message>
    550         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="112"/>
    551         <source>Open File</source>
    552         <translation>Datei öffnen</translation>
    553     </message>
    554     <message>
    555         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="161"/>
    556         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="184"/>
    557         <source>SMSSender</source>
    558         <translation>SMSSender</translation>
    559     </message>
    560     <message>
    561         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="162"/>
    562         <source>This contact is already known under this alias.</source>
    563         <translation>Diesem Kontakt wurde dieser Alias bereits zugewiesen.</translation>
    564     </message>
    565     <message>
    566         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="185"/>
    567         <source>Do you really want to remove this alias?</source>
    568         <translation>Soll dieser Alias wirklich entfernt werden?</translation>
    569     </message>
    570     <message>
    571         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="204"/>
    572         <source>Please enter a name for this contact.</source>
    573         <translation>Der Name des Kontakts kann nicht leer sein.</translation>
    574     </message>
    575     <message>
    576         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="210"/>
    577         <source>The given phone number is not valid.</source>
    578         <translation>Die Telefonnummer ist ungültig.</translation>
    579     </message>
    580     <message>
    581         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="214"/>
    582         <source>&quot;%1&quot; is already in the adressbook with the same number.</source>
    583         <translation>&quot;%1&quot; ist bereits mit derselben Telefonnummer im Adressbuch eingetragen.</translation>
    584     </message>
    585     <message>
    586         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="243"/>
    587         <source>Some names of this contact are already in use:</source>
    588         <translation>Einige Namen werden bereits verwendet:</translation>
    589     </message>
    590     <message>
    591         <location filename="../src/ui/VCEditContact/vceditcontact.cpp" line="250"/>
    592         <source>Edit contact</source>
    593         <translation>Kontakt bearbeiten</translation>
    594     </message>
    595 </context>
    596 <context>
    597     <name>VCEditContactClass</name>
    598     <message>
    599         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="17"/>
    600         <source>Edit contact</source>
    601         <translation>Kontakt bearbeiten</translation>
    602     </message>
    603     <message>
    604         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="30"/>
    605         <source>Contact information</source>
    606         <translation>Kontaktinformationen</translation>
    607     </message>
    608     <message>
    609         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="36"/>
    610         <source>Name:</source>
    611         <translation>Name:</translation>
    612     </message>
    613     <message>
    614         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="46"/>
     652        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="46"/>
    615653        <source>Number:</source>
    616654        <translation>Nummer:</translation>
    617655    </message>
    618656    <message>
    619         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="87"/>
     657        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="87"/>
    620658        <source>QToolButton#btnIcon::menu-indicator {
    621659        image: none;
     
    624662    </message>
    625663    <message>
    626         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="109"/>
     664        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="109"/>
    627665        <source>Aliases</source>
    628666        <translation>Aliasse</translation>
    629667    </message>
    630668    <message>
    631         <location filename="../src/ui/VCEditContact/vceditcontact.ui" line="173"/>
     669        <location filename="../src/ui/vceditcontact/vceditcontact.ui" line="173"/>
    632670        <source>Edit account</source>
    633671        <translation>Konto bearbeiten</translation>
     
    637675    <name>VCEditGroup</name>
    638676    <message>
    639         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="58"/>
     677        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="75"/>
    640678        <source>Change icon</source>
    641679        <translation>Bild ändern</translation>
    642680    </message>
    643681    <message>
    644         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="64"/>
     682        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="81"/>
    645683        <source>Remove icon</source>
    646684        <translation>Bild entfernen</translation>
    647685    </message>
    648686    <message>
    649         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="103"/>
     687        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="120"/>
    650688        <source>Images</source>
    651689        <translation>Bilder</translation>
    652690    </message>
    653691    <message>
    654         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="110"/>
     692        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="127"/>
    655693        <source>Open File</source>
    656694        <translation>Datei öffnen</translation>
    657695    </message>
    658696    <message>
    659         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="176"/>
     697        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="193"/>
    660698        <source>Please enter a name for this group.</source>
    661699        <translation>Der Gruppenname kann nicht leer sein.</translation>
    662700    </message>
    663701    <message>
    664         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="193"/>
     702        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="210"/>
    665703        <source>The name of this group is already in use.</source>
    666704        <translation>Dieser Gruppenname wird bereits verwendet.</translation>
    667705    </message>
    668706    <message>
    669         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="199"/>
     707        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="216"/>
    670708        <source>The group should contain at least one contact.</source>
    671709        <translation>Die Gruppe muss mindestens ein Kontakt enthalten.</translation>
    672710    </message>
    673711    <message>
    674         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="205"/>
     712        <location filename="../src/ui/vceditgroup/vceditgroup.cpp" line="222"/>
    675713        <source>Edit group</source>
    676714        <translation>Gruppe bearbeiten</translation>
     
    680718    <name>VCEditGroupClass</name>
    681719    <message>
    682         <location filename="../src/ui/VCEditGroup/vceditgroup.ui" line="17"/>
     720        <location filename="../src/ui/vceditgroup/vceditgroup.ui" line="17"/>
    683721        <source>Edit group</source>
    684722        <translation>Gruppe bearbeiten</translation>
    685723    </message>
    686724    <message>
    687         <location filename="../src/ui/VCEditGroup/vceditgroup.ui" line="32"/>
     725        <location filename="../src/ui/vceditgroup/vceditgroup.ui" line="32"/>
    688726        <source>Group information</source>
    689727        <translation>Gruppeninformationen</translation>
    690728    </message>
    691729    <message>
    692         <location filename="../src/ui/VCEditGroup/vceditgroup.ui" line="41"/>
     730        <location filename="../src/ui/vceditgroup/vceditgroup.ui" line="41"/>
    693731        <source>Name:</source>
    694732        <translation>Name:</translation>
    695733    </message>
    696734    <message>
    697         <location filename="../src/ui/VCEditGroup/vceditgroup.ui" line="73"/>
     735        <location filename="../src/ui/vceditgroup/vceditgroup.ui" line="73"/>
    698736        <source>QToolButton#btnIcon::menu-indicator {
    699737        image: none;
     
    702740    </message>
    703741    <message>
    704         <location filename="../src/ui/VCEditGroup/vceditgroup.ui" line="105"/>
     742        <location filename="../src/ui/vceditgroup/vceditgroup.ui" line="105"/>
    705743        <source>Available contacts</source>
    706744        <translation>Mögliche Kontakte</translation>
    707745    </message>
    708746    <message>
    709         <location filename="../src/ui/VCEditGroup/vceditgroup.ui" line="206"/>
     747        <location filename="../src/ui/vceditgroup/vceditgroup.ui" line="206"/>
    710748        <source>Members</source>
    711749        <translation>Mitglieder</translation>
     
    713751</context>
    714752<context>
     753    <name>VCImportContactsImportedContactTableModel</name>
     754    <message>
     755        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_importedcontacttablemodel.cpp" line="37"/>
     756        <source>Import</source>
     757        <translation>Importieren</translation>
     758    </message>
     759    <message>
     760        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_importedcontacttablemodel.cpp" line="39"/>
     761        <source>Name</source>
     762        <translation>Name</translation>
     763    </message>
     764    <message>
     765        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_importedcontacttablemodel.cpp" line="40"/>
     766        <source>Number</source>
     767        <translation>Nummer</translation>
     768    </message>
     769    <message>
     770        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_importedcontacttablemodel.cpp" line="41"/>
     771        <source>Aliases</source>
     772        <translation>Aliasse</translation>
     773    </message>
     774</context>
     775<context>
     776    <name>VCImportContactsPageConclusion</name>
     777    <message>
     778        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.cpp" line="36"/>
     779        <source>Finishing import</source>
     780        <translation>Import wird abgeschlossen</translation>
     781    </message>
     782    <message>
     783        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.cpp" line="66"/>
     784        <source>Import finished</source>
     785        <translation>Import abgeschlossen</translation>
     786    </message>
     787</context>
     788<context>
     789    <name>VCImportContactsPageConclusionClass</name>
     790    <message>
     791        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.ui" line="14"/>
     792        <source>VCImportContactsPageConclusion</source>
     793        <translation>VCImportContactsPageConclusion</translation>
     794    </message>
     795    <message>
     796        <source>Import finished</source>
     797        <translation type="obsolete">Import abgeschlossen</translation>
     798    </message>
     799    <message>
     800        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.ui" line="20"/>
     801        <source>The imported contacts are being saved.</source>
     802        <translation>Die importierten Kontakte werden gespeichert.</translation>
     803    </message>
     804    <message>
     805        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.ui" line="37"/>
     806        <source>The import has been finished. You can use the imported contacs after closing this dialog.</source>
     807        <translation>Der Import wurde abgeschlossen. Die importierten Kontakte können nach dem Schliessen des Dialogs verwendet werden.</translation>
     808    </message>
     809</context>
     810<context>
     811    <name>VCImportContactsPageEditContactsClass</name>
     812    <message>
     813        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.ui" line="14"/>
     814        <source>VCImportContactsPageEditContacts</source>
     815        <translation>VCImportContactsPageEditContacts</translation>
     816    </message>
     817    <message>
     818        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.ui" line="17"/>
     819        <source>Review your imported contacts</source>
     820        <translation>Die importierten Kontakte überprüfen</translation>
     821    </message>
     822    <message>
     823        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.ui" line="20"/>
     824        <source>The import of your contacts has been done. Please review them and, if needed, fix some merge errors.</source>
     825        <translation>Der Kontakt-Import wurde abgeschlossen. Bitte überprüfe die Kontaktdaten und, wenn nötig, behebe allfällige Fehler.</translation>
     826    </message>
     827    <message>
     828        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.ui" line="32"/>
     829        <source>Edit the selected contact.</source>
     830        <translation>Bearbeite den angewählten Kontakt.</translation>
     831    </message>
     832    <message>
     833        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.ui" line="71"/>
     834        <source>Filter...</source>
     835        <translation>Filter...</translation>
     836    </message>
     837</context>
     838<context>
     839    <name>VCImportContactsPageImportClass</name>
     840    <message>
     841        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_import.ui" line="14"/>
     842        <source>VCImportContactsPageImport</source>
     843        <translation>VCImportContactsPageImport</translation>
     844    </message>
     845    <message>
     846        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_import.ui" line="17"/>
     847        <source>Importing contacts</source>
     848        <translation>Importiere Kontakte</translation>
     849    </message>
     850    <message>
     851        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_import.ui" line="39"/>
     852        <source>The import of the contacts is being processed now. This can take some time to finish.</source>
     853        <translation>Die Kontakte werden importiert. Dies kann einen Moment in Anspruch nehmen.</translation>
     854    </message>
     855</context>
     856<context>
     857    <name>VCImportContactsPageIntroClass</name>
     858    <message>
     859        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_intro.ui" line="14"/>
     860        <source>VCImportContactsPageIntro</source>
     861        <translation>VCImportContactsPageIntro</translation>
     862    </message>
     863    <message>
     864        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_intro.ui" line="17"/>
     865        <source>Introduction</source>
     866        <translation>Einstieg</translation>
     867    </message>
     868    <message>
     869        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_intro.ui" line="20"/>
     870        <source>This wizard will import contacts from older versions of this program, mail programs, common address book formats or gateways into smssender.</source>
     871        <translation>Importiere Kontakte von älteren Versionen dieses Programms, Mailprogrammen, üblichen Adressbuchformaten oder SMS-Diensten.</translation>
     872    </message>
     873    <message>
     874        <location filename="../src/ui/vcimportcontacts/vcimportcontacts_page_intro.ui" line="26"/>
     875        <source>Please select from where you would like to import contacs:</source>
     876        <translation>Bitte wähle von wo Kontakte importiert werden sollen:</translation>
     877    </message>
     878</context>
     879<context>
     880    <name>VCImportContactsWizard</name>
     881    <message>
     882        <location filename="../src/ui/vcimportcontacts/vcimportcontactswizard.cpp" line="31"/>
     883        <source>Import contacts</source>
     884        <translation>Importiere Kontakte</translation>
     885    </message>
     886</context>
     887<context>
    715888    <name>VCMain</name>
    716889    <message>
    717         <location filename="../src/ui/VCMain/vcmain.cpp" line="350"/>
     890        <location filename="../src/ui/vcmain/vcmain.cpp" line="392"/>
    718891        <source>SMSSender</source>
    719892        <translation>SMSSender</translation>
    720893    </message>
    721894    <message>
    722         <location filename="../src/ui/VCMain/vcmain.cpp" line="351"/>
     895        <location filename="../src/ui/vcmain/vcmain.cpp" line="393"/>
    723896        <source>This number is not yet in your address book. Do you want to add it?</source>
    724897        <translation>Diese Nummer ist noch nicht im Adressbuch eingetragen. Willst du sie hinzufügen?</translation>
    725898    </message>
    726899    <message>
    727         <location filename="../src/ui/VCMain/vcmain.cpp" line="441"/>
     900        <location filename="../src/ui/vcmain/vcmain.cpp" line="489"/>
    728901        <source>%1 SMS</source>
    729902        <translation>%1 SMS</translation>
    730903    </message>
    731904    <message>
    732         <location filename="../src/ui/VCMain/vcmain.cpp" line="518"/>
    733         <location filename="../src/ui/VCMain/vcmain.cpp" line="532"/>
    734         <location filename="../src/ui/VCMain/vcmain.cpp" line="567"/>
     905        <location filename="../src/ui/vcmain/vcmain.cpp" line="566"/>
     906        <location filename="../src/ui/vcmain/vcmain.cpp" line="580"/>
     907        <location filename="../src/ui/vcmain/vcmain.cpp" line="615"/>
    735908        <source>Error occured</source>
    736909        <translation>Fehler aufgetreten</translation>
    737910    </message>
    738911    <message>
    739         <location filename="../src/ui/VCMain/vcmain.cpp" line="519"/>
     912        <location filename="../src/ui/vcmain/vcmain.cpp" line="567"/>
    740913        <source>An error occured while initializing the account &quot;%1&quot;:</source>
    741914        <translation>Ein Fehler trat wärend dem Initialisieren des Kontos &quot;%1&quot; auf:</translation>
    742915    </message>
    743916    <message>
    744         <location filename="../src/ui/VCMain/vcmain.cpp" line="528"/>
     917        <location filename="../src/ui/vcmain/vcmain.cpp" line="576"/>
    745918        <source>Errors occured while loading your accounts.</source>
    746919        <translation>Beim Laden der Konten trat ein Fehler auf.</translation>
    747920    </message>
    748921    <message>
    749         <location filename="../src/ui/VCMain/vcmain.cpp" line="550"/>
     922        <location filename="../src/ui/vcmain/vcmain.cpp" line="598"/>
    750923        <source>SMS sent</source>
    751924        <translation>SMS gesendet</translation>
    752925    </message>
    753926    <message>
    754         <location filename="../src/ui/VCMain/vcmain.cpp" line="551"/>
     927        <location filename="../src/ui/vcmain/vcmain.cpp" line="599"/>
    755928        <source>The sms has been sent.</source>
    756929        <translation>Die SMS wurde vesendet.</translation>
    757930    </message>
    758931    <message>
    759         <location filename="../src/ui/VCMain/vcmain.cpp" line="566"/>
     932        <location filename="../src/ui/vcmain/vcmain.cpp" line="614"/>
    760933        <source>Error occured while sending the sms.</source>
    761934        <translation>Ein Fehler trat wärend dem Senden der SMS auf.</translation>
     
    765938    <name>VCMainClass</name>
    766939    <message>
    767         <location filename="../src/ui/VCMain/vcmain.ui" line="17"/>
     940        <location filename="../src/ui/vcmain/vcmain.ui" line="17"/>
    768941        <source>SMSSender</source>
    769942        <translation>SMSSender</translation>
    770943    </message>
    771944    <message>
    772         <location filename="../src/ui/VCMain/vcmain.ui" line="24"/>
     945        <location filename="../src/ui/vcmain/vcmain.ui" line="24"/>
    773946        <source>Message</source>
    774947        <translation>Mitteilung</translation>
    775948    </message>
    776949    <message>
    777         <location filename="../src/ui/VCMain/vcmain.ui" line="39"/>
     950        <location filename="../src/ui/vcmain/vcmain.ui" line="39"/>
    778951        <source>This sms has been sent.</source>
    779952        <translation>Die SMS wurde vesendet.</translation>
    780953    </message>
    781954    <message>
    782         <location filename="../src/ui/VCMain/vcmain.ui" line="102"/>
     955        <location filename="../src/ui/vcmain/vcmain.ui" line="102"/>
    783956        <source>Account</source>
    784957        <translation>Konto</translation>
    785958    </message>
    786959    <message>
    787         <location filename="../src/ui/VCMain/vcmain.ui" line="127"/>
     960        <location filename="../src/ui/vcmain/vcmain.ui" line="127"/>
    788961        <source>Recipients</source>
    789962        <translation>Empfänger</translation>
    790963    </message>
    791964    <message>
    792         <location filename="../src/ui/VCMain/vcmain.ui" line="149"/>
     965        <location filename="../src/ui/vcmain/vcmain.ui" line="152"/>
    793966        <source>Add</source>
    794967        <translation>Hinzufügen</translation>
    795968    </message>
    796969    <message>
    797         <location filename="../src/ui/VCMain/vcmain.ui" line="169"/>
     970        <location filename="../src/ui/vcmain/vcmain.ui" line="172"/>
    798971        <source>Remove</source>
    799972        <translation>Entfernen</translation>
    800973    </message>
    801974    <message>
    802         <location filename="../src/ui/VCMain/vcmain.ui" line="258"/>
     975        <location filename="../src/ui/vcmain/vcmain.ui" line="261"/>
    803976        <source>Send</source>
    804977        <translation>Senden</translation>
    805978    </message>
    806979    <message>
    807         <location filename="../src/ui/VCMain/vcmain.ui" line="292"/>
     980        <location filename="../src/ui/vcmain/vcmain.ui" line="295"/>
    808981        <source>&amp;File</source>
    809982        <translation>&amp;Datei</translation>
    810983    </message>
    811984    <message>
    812         <location filename="../src/ui/VCMain/vcmain.ui" line="299"/>
     985        <location filename="../src/ui/vcmain/vcmain.ui" line="302"/>
    813986        <source>&amp;Help</source>
    814987        <translation>&amp;Hilfe</translation>
    815988    </message>
    816989    <message>
    817         <location filename="../src/ui/VCMain/vcmain.ui" line="305"/>
     990        <location filename="../src/ui/vcmain/vcmain.ui" line="308"/>
    818991        <source>&amp;Edit</source>
    819992        <translation>&amp;Bearbeiten</translation>
    820993    </message>
    821994    <message>
    822         <location filename="../src/ui/VCMain/vcmain.ui" line="323"/>
     995        <location filename="../src/ui/vcmain/vcmain.ui" line="326"/>
    823996        <source>&amp;Exit</source>
    824997        <translation>&amp;Beenden</translation>
    825998    </message>
    826999    <message>
    827         <location filename="../src/ui/VCMain/vcmain.ui" line="335"/>
     1000        <location filename="../src/ui/vcmain/vcmain.ui" line="338"/>
    8281001        <source>&amp;About</source>
    8291002        <translation>Ü&amp;ber</translation>
    8301003    </message>
    8311004    <message>
    832         <location filename="../src/ui/VCMain/vcmain.ui" line="350"/>
     1005        <location filename="../src/ui/vcmain/vcmain.ui" line="353"/>
    8331006        <source>Prefere&amp;nces</source>
    8341007        <translation>&amp;Einstellungen</translation>
    8351008    </message>
    8361009    <message>
    837         <location filename="../src/ui/VCMain/vcmain.ui" line="362"/>
     1010        <location filename="../src/ui/vcmain/vcmain.ui" line="365"/>
    8381011        <source>&amp;Accounts</source>
    8391012        <translation>&amp;Konten</translation>
    8401013    </message>
    8411014    <message>
    842         <location filename="../src/ui/VCMain/vcmain.ui" line="371"/>
     1015        <location filename="../src/ui/vcmain/vcmain.ui" line="374"/>
    8431016        <source>Address &amp;Book</source>
    8441017        <translation>&amp;Adressbuch</translation>
    8451018    </message>
    8461019    <message>
    847         <location filename="../src/ui/VCMain/vcmain.ui" line="380"/>
     1020        <location filename="../src/ui/vcmain/vcmain.ui" line="383"/>
    8481021        <source>&amp;New message</source>
    8491022        <translation>&amp;Neue Mitteilung</translation>
     
    8531026    <name>VCSendingDialog</name>
    8541027    <message>
    855         <location filename="../src/ui/vcsendingdialog/vcsendingdialog.cpp" line="59"/>
     1028        <location filename="../src/ui/vcsendingdialog/vcsendingdialog.cpp" line="54"/>
    8561029        <source>The sms has been sent.</source>
    8571030        <translation>Die SMS wurde vesendet.</translation>
    8581031    </message>
    8591032    <message>
    860         <location filename="../src/ui/vcsendingdialog/vcsendingdialog.cpp" line="63"/>
     1033        <location filename="../src/ui/vcsendingdialog/vcsendingdialog.cpp" line="58"/>
    8611034        <source>Sending cancelled.</source>
    8621035        <translation>Das Senden wurde abgebrochen.</translation>
  • smssender.pro

    r92 r94  
    2424HEADERS += src/business/bcaccountinitmanager.h \
    2525    src/business/bcaccountmanager.h \
     26    src/business/bccontactimportermanager.h \
    2627    src/business/bccontactmanager.h \
    2728    src/business/bcgatewaymanager.h \
    2829    src/business/bcgroupmanager.h \
    2930    src/business/bclibraryloader.h \
     31    src/business/bcoldsettingscontactimporter.h \
    3032    src/business/bcsettings.h \
    3133    src/business/bcsuffixmanager.h \
     
    5557    src/ui/vceditcontact/vceditcontact.h \
    5658    src/ui/vceditgroup/vceditgroup.h \
     59    src/ui/vcimportcontacts/vcimportcontactswizard.h \
     60    src/ui/vcimportcontacts/vcimportcontacts_datamanager.h \
     61    src/ui/vcimportcontacts/vcimportcontacts_importedcontacttablemodel.h \
     62    src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.h \
     63    src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.h \
     64    src/ui/vcimportcontacts/vcimportcontacts_page_import.h \
     65    src/ui/vcimportcontacts/vcimportcontacts_page_intro.h \
    5766    src/ui/vcmain/vcmain.h \
    5867    src/ui/vcsendingdialog/vcsendingdialog.h \
    5968    src/ui/vcsettings/vcsettings.h \
    60     src/bootstrap.h 
     69    src/bootstrap.h
    6170SOURCES += src/business/bcaccountinitmanager.cpp \
    6271    src/business/bcaccountmanager.cpp \
     72    src/business/bccontactimportermanager.cpp \
    6373    src/business/bccontactmanager.cpp \
    6474    src/business/bcgatewaymanager.cpp \
    6575    src/business/bcgroupmanager.cpp \
    6676    src/business/bclibraryloader.cpp \
     77    src/business/bcoldsettingscontactimporter.cpp \
    6778    src/business/bcsettings.cpp \
    6879    src/business/bcsuffixmanager.cpp \
     
    93104    src/ui/vceditcontact/vceditcontact.cpp \
    94105    src/ui/vceditgroup/vceditgroup.cpp \
     106    src/ui/vcimportcontacts/vcimportcontactswizard.cpp \
     107    src/ui/vcimportcontacts/vcimportcontacts_datamanager.cpp \
     108    src/ui/vcimportcontacts/vcimportcontacts_importedcontacttablemodel.cpp \
     109    src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.cpp \
     110    src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.cpp \
     111    src/ui/vcimportcontacts/vcimportcontacts_page_import.cpp \
     112    src/ui/vcimportcontacts/vcimportcontacts_page_intro.cpp \
    95113    src/ui/vcmain/vcmain.cpp \
    96114    src/ui/vcsendingdialog/vcsendingdialog.cpp \
     
    104122    src/ui/vceditcontact/vceditcontact.ui \
    105123    src/ui/vceditgroup/vceditgroup.ui \
     124    src/ui/vcimportcontacts/vcimportcontacts_page_conclusion.ui \
     125    src/ui/vcimportcontacts/vcimportcontacts_page_editcontacts.ui \
     126    src/ui/vcimportcontacts/vcimportcontacts_page_import.ui \
     127    src/ui/vcimportcontacts/vcimportcontacts_page_intro.ui \
    106128    src/ui/vcmain/vcmain.ui \
    107129    src/ui/vcsendingdialog/vcsendingdialog.ui \
     
    114136}
    115137win32:RC_FILE = lib/smssender.rc
    116 unix {
     138unix { 
    117139    target.path = /usr/bin/
    118140    INSTALLS += target
  • src/persistence/dasettings.cpp

    r92 r94  
    2727    QLocale locale(localeStr);
    2828    if (locale.name() != localeStr){
    29         return QLocale::system(); // The default locale of the system
    30     }else{
    31         return locale;
     29        locale = QLocale::system(); // The default locale of the system
    3230    }
     31
     32    if ((locale.language() == QLocale::German) && (locale.country() != QLocale::Switzerland)) {
     33        locale = QLocale(QLocale::German, QLocale::Switzerland);
     34    }
     35
     36    return locale;
    3337}
    3438
  • src/ui/vcaddressbook/vcaddressbook.h

    r92 r94  
    6464    void on_btnEditContact_clicked();
    6565    void on_btnRemoveContact_clicked();
     66    void on_btnImportContacts_clicked();
    6667    void on_tblViewContacts_selectionChanged();
    6768
  • src/ui/vcaddressbook/vcaddressbook.ui

    r92 r94  
    4444     <widget class="QWidget" name="tab_contacts">
    4545      <attribute name="icon">
    46        <iconset>
     46       <iconset resource="../../../lib/resource.qrc">
    4747        <normaloff>:/ico/user.png</normaloff>:/ico/user.png</iconset>
    4848      </attribute>
     
    5353       <item row="0" column="0">
    5454        <widget class="QToolButton" name="btnAddContact">
    55          <property name="sizePolicy">
    56           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
    57            <horstretch>0</horstretch>
    58            <verstretch>0</verstretch>
    59           </sizepolicy>
    60          </property>
    61          <property name="minimumSize">
    62           <size>
    63            <width>34</width>
    64            <height>34</height>
    65           </size>
    66          </property>
    67          <property name="text">
    68           <string/>
    69          </property>
    70          <property name="icon">
    71           <iconset>
     55         <property name="minimumSize">
     56          <size>
     57           <width>34</width>
     58           <height>34</height>
     59          </size>
     60         </property>
     61         <property name="toolTip">
     62          <string>Add a new contact.</string>
     63         </property>
     64         <property name="text">
     65          <string/>
     66         </property>
     67         <property name="icon">
     68          <iconset resource="../../../lib/resource.qrc">
    7269           <normaloff>:/ico/add.png</normaloff>:/ico/add.png</iconset>
    7370         </property>
     
    7673       <item row="0" column="1">
    7774        <widget class="QToolButton" name="btnRemoveContact">
    78          <property name="sizePolicy">
    79           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
    80            <horstretch>0</horstretch>
    81            <verstretch>0</verstretch>
    82           </sizepolicy>
    83          </property>
    84          <property name="minimumSize">
    85           <size>
    86            <width>34</width>
    87            <height>34</height>
    88           </size>
    89          </property>
    90          <property name="text">
    91           <string/>
    92          </property>
    93          <property name="icon">
    94           <iconset>
     75         <property name="minimumSize">
     76          <size>
     77           <width>34</width>
     78           <height>34</height>
     79          </size>
     80         </property>
     81         <property name="toolTip">
     82          <string>Remove the selected contact.</string>
     83         </property>
     84         <property name="text">
     85          <string/>
     86         </property>
     87         <property name="icon">
     88          <iconset resource="../../../lib/resource.qrc">
    9589           <normaloff>:/ico/remove.png</normaloff>:/ico/remove.png</iconset>
    9690         </property>
     
    9993       <item row="0" column="2">
    10094        <widget class="QToolButton" name="btnEditContact">
    101          <property name="sizePolicy">
    102           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
    103            <horstretch>0</horstretch>
    104            <verstretch>0</verstretch>
    105           </sizepolicy>
    106          </property>
    107          <property name="minimumSize">
    108           <size>
    109            <width>34</width>
    110            <height>34</height>
    111           </size>
    112          </property>
    113          <property name="toolTip">
    114           <string>Edit account</string>
    115          </property>
    116          <property name="text">
    117           <string/>
    118          </property>
    119          <property name="icon">
    120           <iconset>
     95         <property name="minimumSize">
     96          <size>
     97           <width>34</width>
     98           <height>34</height>
     99          </size>
     100         </property>
     101         <property name="toolTip">
     102          <string>Edit the selected contact.</string>
     103         </property>
     104         <property name="text">
     105          <string/>
     106         </property>
     107         <property name="icon">
     108          <iconset resource="../../../lib/resource.qrc">
    121109           <normaloff>:/ico/edit.png</normaloff>:/ico/edit.png</iconset>
    122110         </property>
     
    128116          <enum>Qt::Horizontal</enum>
    129117         </property>
     118         <property name="sizeType">
     119          <enum>QSizePolicy::Fixed</enum>
     120         </property>
    130121         <property name="sizeHint" stdset="0">
    131122          <size>
    132            <width>328</width>
     123           <width>15</width>
    133124           <height>20</height>
    134125          </size>
     
    137128       </item>
    138129       <item row="0" column="4">
     130        <widget class="QToolButton" name="btnImportContacts">
     131         <property name="minimumSize">
     132          <size>
     133           <width>34</width>
     134           <height>34</height>
     135          </size>
     136         </property>
     137         <property name="toolTip">
     138          <string>Import contacts.</string>
     139         </property>
     140         <property name="text">
     141          <string/>
     142         </property>
     143         <property name="icon">
     144          <iconset resource="../../../lib/resource.qrc">
     145           <normaloff>:/ico/import.png</normaloff>:/ico/import.png</iconset>
     146         </property>
     147        </widget>
     148       </item>
     149       <item row="0" column="5">
     150        <spacer name="horizontalSpacer_3">
     151         <property name="orientation">
     152          <enum>Qt::Horizontal</enum>
     153         </property>
     154         <property name="sizeHint" stdset="0">
     155          <size>
     156           <width>40</width>
     157           <height>20</height>
     158          </size>
     159         </property>
     160        </spacer>
     161       </item>
     162       <item row="0" column="6">
    139163        <widget class="SearchLineEdit" name="edtContactFilter">
    140164         <property name="minimumSize">
     
    155179        </widget>
    156180       </item>
    157        <item row="1" column="0" colspan="5">
     181       <item row="1" column="0" colspan="7">
    158182        <widget class="QTableView" name="tblViewContacts">
    159183         <property name="alternatingRowColors">
     
    196220     <widget class="QWidget" name="tab_contactGroups">
    197221      <attribute name="icon">
    198        <iconset>
     222       <iconset resource="../../../lib/resource.qrc">
    199223        <normaloff>:/ico/users.png</normaloff>:/ico/users.png</iconset>
    200224      </attribute>
     
    217241          </size>
    218242         </property>
    219          <property name="text">
    220           <string/>
    221          </property>
    222          <property name="icon">
    223           <iconset>
     243         <property name="toolTip">
     244          <string>Add a new group.</string>
     245         </property>
     246         <property name="text">
     247          <string/>
     248         </property>
     249         <property name="icon">
     250          <iconset resource="../../../lib/resource.qrc">
    224251           <normaloff>:/ico/add.png</normaloff>:/ico/add.png</iconset>
    225252         </property>
     
    240267          </size>
    241268         </property>
    242          <property name="text">
    243           <string/>
    244          </property>
    245          <property name="icon">
    246           <iconset>
     269         <property name="toolTip">
     270          <string>Remove the selected group.</string>
     271         </property>
     272         <property name="text">
     273          <string/>
     274         </property>
     275         <property name="icon">
     276          <iconset resource="../../../lib/resource.qrc">
    247277           <normaloff>:/ico/remove.png</normaloff>:/ico/remove.png</iconset>
    248278         </property>
     
    264294         </property>
    265295         <property name="toolTip">
    266           <string>Edit account</string>
    267          </property>
    268          <property name="text">
    269           <string/>
    270          </property>
    271          <property name="icon">
    272           <iconset>
     296          <string>Edit the selected group.</string>
     297         </property>
     298         <property name="text">
     299          <string/>
     300         </property>
     301         <property name="icon">
     302          <iconset resource="../../../lib/resource.qrc">
    273303           <normaloff>:/ico/edit.png</normaloff>:/ico/edit.png</iconset>
    274304         </property>
  • src/ui/vcaddressbook/vcaddressbook_contact.cpp

    r92 r94  
    2222#include "business/bccontactmanager.h"
    2323#include "ui/vceditcontact/vceditcontact.h"
     24#include "ui/vcimportcontacts/vcimportcontactswizard.h"
    2425
    2526
     
    4041
    4142void VCAddressBook::editContact(SContact* contact){
    42     VCEditContact* ec = new VCEditContact(contact, this);
     43    VCEditContact* ec = new VCEditContact(contact, false, this);
    4344    if (ec->exec() == QDialog::Accepted){ // Wait for return
    4445        BCContactManager::instance()->saveContact(contact);
    4546    }
     47    delete ec;
    4648}
    4749
     
    8688}
    8789
     90void VCAddressBook::on_btnImportContacts_clicked() {
     91    VCImportContactsWizard* w = new VCImportContactsWizard();
     92    w->exec();
     93    delete w;
     94}
     95
    8896void VCAddressBook::on_tblViewContacts_selectionChanged() {
    8997    ui.btnEditContact->setEnabled(ui.tblViewContacts->selectionModel()->hasSelection());
  • src/ui/vcaddressbook/vcaddressbook_group.cpp

    r92 r94  
    4444        BCGroupManager::instance()->saveGroup(group);
    4545    }
     46    delete eg;
    4647}
    4748
  • src/ui/vceditcontact/vceditcontact.cpp

    r92 r94  
    3232#include "business/bcgroupmanager.h"
    3333
    34 VCEditContact::VCEditContact(SContact* contact, QWidget *parent)
     34VCEditContact::VCEditContact(SContact* contact, bool ignoreAlreadyExisting, QWidget *parent)
    3535    : QDialog(parent)
    3636    , contact_(contact)
     37    , ignoreAlreadyExisting_(ignoreAlreadyExisting)
    3738{
    3839        ui.setupUi(this);
     
    222223    }
    223224
     225    QSet<SContact*> contactList = BCContactManager::instance()->getContactList();
     226
    224227    // Validate the number
    225228    SNumber no(ui.edtCountryCode->text() + " " + ui.edtNumber->text());
     
    229232        SContact* c = BCContactManager::instance()->getContactByNumber(no);
    230233        if ((c != NULL) && (c != contact_)) {
    231             errorMessages += tr("\"%1\" is already in the adressbook with the same number.").arg(c->name()) + "\n";
     234            if (ignoreAlreadyExisting_) {
     235                contactList.remove(c);
     236            } else {
     237                errorMessages += tr("\"%1\" is already in the adressbook with the same number.").arg(c->name()) + "\n";
     238            }
    232239        }
    233240    }
     
    235242    // Validate the name and aliases for double usage
    236243    QStringList reservedNames;
    237     foreach (SContact* contact, BCContactManager::instance()->getContactList()) {
     244    foreach (SContact* contact, contactList) {
    238245        if (contact == contact_)
    239246            continue;
  • src/ui/vceditcontact/vceditcontact.h

    r92 r94  
    2929
    3030public:
    31     VCEditContact(SContact* contact, QWidget *parent = 0);
     31    VCEditContact(SContact* contact, bool ignoreAlreadyExisting = false, QWidget *parent = 0);
    3232    ~VCEditContact() {};
    3333
     
    3535    Ui::VCEditContactClass ui;
    3636    SContact* contact_;
     37    bool      ignoreAlreadyExisting_;
    3738    QIcon   defaultIcon_;
    3839    QImage  contactImage_;
  • src/ui/vcmain/vcmain.cpp

    r92 r94  
    359359    if (ui.lstContacts->completer()->currentRow() >= 0) {
    360360        if (ui.lstContacts->currentIndex() == -1) {
    361             ui.lstContacts->setCurrentIndex(ui.lstContacts->findText(ui.lstContacts->completer()->currentCompletion()));
     361            ui.lstContacts->setCurrentIndex(ui.lstContacts->findText(ui.lstContacts->currentText()));
    362362        }
    363363        QTimer::singleShot(0, this, SLOT(on_btnAddRecipient_clicked()));
     
    367367void VCMain::on_btnAddRecipient_clicked(){
    368368    if (!recipientAddingEnabled_) return;
     369    recipientAddingEnabled_ = false; // Ignore multiple calls of btnAddRecipient-clicked events
    369370
    370371    qDebug() << ui.lstContacts->currentIndex();
     
    393394                                                              QMessageBox::Yes | QMessageBox::No,
    394395                                                              QMessageBox::Yes)) {
    395                     VCEditContact* ec = new VCEditContact(recipient, this);
     396                    VCEditContact* ec = new VCEditContact(recipient, false, this);
    396397                    if (ec->exec() == QDialog::Accepted){ // Wait for return
    397398                        BCContactManager::instance()->saveContact(recipient);
     
    412413    enableSendBtnIfAllFilled();
    413414
    414     recipientAddingEnabled_ = false; // Ignore multiple calls of btnAddRecipient-clicked events
    415415    QTimer::singleShot(20, this, SLOT(reenableRecipientAdding()));
    416416}
Note: See TracChangeset for help on using the changeset viewer.