Changeset 317:7baa63a067a2 in SMSSender


Ignore:
Timestamp:
Feb 9, 2014 2:19:48 PM (8 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
separation-frontend-backend
Message:
  • Rearranges frontend/gui/ui/ to make it flatter.
Location:
frontend/gui
Files:
4 edited
40 moved

Legend:

Unmodified
Added
Removed
  • frontend/gui/frontend-gui.pro

    r315 r317  
    5454    ui/components/searchlineedit.h \
    5555    ui/components/taskstatusbar.h \
    56     ui/contactimporterpages/contactfilesimporter/cfi_contactfilesmodel.h \
    57     ui/contactimporterpages/contactfilesimporter/cfi_page_config.h \
    58     ui/contactimporterpages/googlecontactsimporter/gci_page_config.h \
    5956    ui/models/accounttreemodel.h \
    6057    ui/models/loadedaccountmodel.h \
     
    6360    ui/models/contactgroupmodel.h \
    6461    ui/models/aliascompletionmodel.h \
    65     ui/about/about.h \
    66     ui/accountlist/accountlist.h \
    67     ui/addressbook/addressbook.h \
    68     ui/editaccount/editaccount.h \
    69     ui/editcontact/editcontact.h \
    70     ui/editgroup/editgroup.h \
     62    ui/about.h \
     63    ui/accountlist.h \
     64    ui/addressbook.h \
     65    ui/editaccount.h \
     66    ui/editcontact.h \
     67    ui/editgroup.h \
    7168    ui/importcontacts/importcontactswizard.h \
    7269    ui/importcontacts/importcontacts_datamanager.h \
     
    7673    ui/importcontacts/importcontacts_page_import.h \
    7774    ui/importcontacts/importcontacts_page_intro.h \
    78     ui/main/main.h \
    79     ui/sendingdialog/sendingdialog.h \
    80     ui/settingsdialog/settingsdialog.h \
    81     ui/updatedialog/updatedialog.h \
     75    ui/importcontacts/importerpages/contactfilesmodel.h \
     76    ui/importcontacts/importerpages/file_page_config.h \
     77    ui/importcontacts/importerpages/google_page_config.h \
     78    ui/main.h \
     79    ui/sendingdialog.h \
     80    ui/settingsdialog.h \
     81    ui/updatedialog.h \
    8282    bootstrap.h \
    8383    ui/guiintegrationhelper.h \
     
    9797    ui/components/searchlineedit.cpp \
    9898    ui/components/taskstatusbar.cpp \
    99     ui/contactimporterpages/contactfilesimporter/cfi_contactfilesmodel.cpp \
    100     ui/contactimporterpages/contactfilesimporter/cfi_page_config.cpp \
    101     ui/contactimporterpages/googlecontactsimporter/gci_page_config.cpp \
    10299    ui/models/accounttreemodel.cpp \
    103100    ui/models/aliascompletionmodel.cpp \
     
    106103    ui/models/grouptablemodel.cpp \
    107104    ui/models/loadedaccountmodel.cpp \
    108     ui/about/about.cpp \
    109     ui/accountlist/accountlist.cpp \
    110     ui/addressbook/addressbook.cpp \
    111     ui/addressbook/addressbook_contact.cpp \
    112     ui/addressbook/addressbook_group.cpp \
    113     ui/editaccount/editaccount.cpp \
    114     ui/editcontact/editcontact.cpp \
    115     ui/editgroup/editgroup.cpp \
     105    ui/about.cpp \
     106    ui/accountlist.cpp \
     107    ui/addressbook.cpp \
     108    ui/addressbook_contact.cpp \
     109    ui/addressbook_group.cpp \
     110    ui/editaccount.cpp \
     111    ui/editcontact.cpp \
     112    ui/editgroup.cpp \
    116113    ui/importcontacts/importcontactswizard.cpp \
    117114    ui/importcontacts/importcontacts_datamanager.cpp \
     
    121118    ui/importcontacts/importcontacts_page_import.cpp \
    122119    ui/importcontacts/importcontacts_page_intro.cpp \
    123     ui/main/main.cpp \
    124     ui/sendingdialog/sendingdialog.cpp \
    125     ui/settingsdialog/settingsdialog.cpp \
    126     ui/updatedialog/updatedialog.cpp \
     120    ui/importcontacts/importerpages/contactfilesmodel.cpp \
     121    ui/importcontacts/importerpages/file_page_config.cpp \
     122    ui/importcontacts/importerpages/google_page_config.cpp \
     123    ui/main.cpp \
     124    ui/sendingdialog.cpp \
     125    ui/settingsdialog.cpp \
     126    ui/updatedialog.cpp \
    127127    bootstrap.cpp \
    128128    smssender-gui.cpp \
     
    134134    business/settings.cpp
    135135FORMS += \
    136     ui/contactimporterpages/contactfilesimporter/cfi_page_config.ui \
    137     ui/contactimporterpages/googlecontactsimporter/gci_page_config.ui \
    138     ui/about/about.ui \
    139     ui/accountlist/accountlist.ui \
    140     ui/addressbook/addressbook.ui \
    141     ui/editaccount/editaccount.ui \
    142     ui/editcontact/editcontact.ui \
    143     ui/editgroup/editgroup.ui \
     136    ui/about.ui \
     137    ui/accountlist.ui \
     138    ui/addressbook.ui \
     139    ui/editaccount.ui \
     140    ui/editcontact.ui \
     141    ui/editgroup.ui \
    144142    ui/importcontacts/importcontacts_page_conclusion.ui \
    145143    ui/importcontacts/importcontacts_page_editcontacts.ui \
    146144    ui/importcontacts/importcontacts_page_import.ui \
    147145    ui/importcontacts/importcontacts_page_intro.ui \
    148     ui/main/main.ui \
    149     ui/sendingdialog/sendingdialog.ui \
    150     ui/settingsdialog/settingsdialog.ui \
    151     ui/updatedialog/updatedialog.ui
     146    ui/importcontacts/importerpages/file_page_config.ui \
     147    ui/importcontacts/importerpages/google_page_config.ui \
     148    ui/main.ui \
     149    ui/sendingdialog.ui \
     150    ui/settingsdialog.ui \
     151    ui/updatedialog.ui
    152152RESOURCES += \
    153153    lib/frontend-gui.qrc
  • frontend/gui/smssender-gui.cpp

    r316 r317  
    2727#include "frontend/gui/business/managerfactory.h"
    2828#include "frontend/gui/persistence/persistencefactory.h"
    29 #include "frontend/gui/ui/main/main.h"
     29#include "frontend/gui/ui/main.h"
    3030
    3131#include <iostream>
  • frontend/gui/ui/accountlist.cpp

    r316 r317  
    2424#include "frontend/business/erroraccount.h"
    2525#include "frontend/gui/ui/completers/bettercompleter.h"
    26 #include "frontend/gui/ui/editaccount/editaccount.h"
     26#include "frontend/gui/ui/editaccount.h"
    2727
    2828namespace UI {
  • frontend/gui/ui/addressbook_contact.cpp

    r316 r317  
    2323#include "frontend/business/contactimportermanager.h"
    2424#include "frontend/business/contactmanager.h"
    25 #include "frontend/gui/ui/editcontact/editcontact.h"
     25#include "frontend/gui/ui/editcontact.h"
    2626#include "frontend/gui/ui/importcontacts/importcontactswizard.h"
    2727
  • frontend/gui/ui/addressbook_group.cpp

    r316 r317  
    2121
    2222#include "frontend/business/groupmanager.h"
    23 #include "frontend/gui/ui/editgroup/editgroup.h"
     23#include "frontend/gui/ui/editgroup.h"
    2424
    2525namespace UI {
  • frontend/gui/ui/guimanager.cpp

    r316 r317  
    2323
    2424#include "common/utils/smacros.h"
    25 #include "frontend/gui/ui/sendingdialog/sendingdialog.h"
     25#include "frontend/gui/ui/sendingdialog.h"
    2626
    2727namespace UI {
  • frontend/gui/ui/importcontacts/importcontacts_page_editcontacts.cpp

    r316 r317  
    2222
    2323#include "frontend/gui/ui/completers/bettercompleter.h"
    24 #include "frontend/gui/ui/editcontact/editcontact.h"
     24#include "frontend/gui/ui/editcontact.h"
    2525#include "frontend/gui/ui/importcontacts/importcontacts_datamanager.h"
    2626#include "frontend/gui/ui/importcontacts/importcontacts_importedcontacttablemodel.h"
  • frontend/gui/ui/importcontacts/importerpages/contactfilesmodel.cpp

    r316 r317  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "cfi_contactfilesmodel.h"
     18#include "contactfilesmodel.h"
    1919
    2020namespace UI {
  • frontend/gui/ui/importcontacts/importerpages/contactfilesmodel.h

    r316 r317  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_CFI_CONTACTFILESMODEL_H_
    19 #define UI_CFI_CONTACTFILESMODEL_H_
     18#ifndef UI_CFI_CONTACTFILESMODEL_H
     19#define UI_CFI_CONTACTFILESMODEL_H
    2020
    2121#include <QAbstractTableModel>
     
    6161} // namespace UI
    6262
    63 #endif /* UI_CFI_CONTACTFILESMODEL_H_ */
     63#endif /* UI_CFI_CONTACTFILESMODEL_H */
  • frontend/gui/ui/importcontacts/importerpages/file_page_config.cpp

    r316 r317  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #include "cfi_page_config.h"
     18#include "file_page_config.h"
    2019
    2120#include <QFileDialog>
    2221
    23 #include "cfi_contactfilesmodel.h"
     22#include "contactfilesmodel.h"
    2423
    2524namespace UI {
  • frontend/gui/ui/importcontacts/importerpages/file_page_config.h

    r316 r317  
    1919#define UI_CFI_PAGE_CONFIG_H
    2020
    21 #include "ui_cfi_page_config.h"
     21#include "ui_file_page_config.h"
    2222
    2323#include <QAbstractTableModel>
  • frontend/gui/ui/importcontacts/importerpages/google_page_config.cpp

    r316 r317  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #include "gci_page_config.h"
     18#include "google_page_config.h"
    2019
    2120namespace UI {
  • frontend/gui/ui/importcontacts/importerpages/google_page_config.h

    r316 r317  
    1919#define UI_GCI_PAGE_CONFIG_H
    2020
    21 #include "ui_gci_page_config.h"
     21#include "ui_google_page_config.h"
    2222
    2323#include <QWizardPage>
  • frontend/gui/ui/main.cpp

    r316 r317  
    2626#include <QSortFilterProxyModel>
    2727
     28#include "common/business/iaccount_tasks.h"
    2829#include "common/domain/snumber.h"
    29 #include "common/business/iaccount_tasks.h"
    3030#include "frontend/business/erroraccount.h"
    31 #include "frontend/gui/ui/about/about.h"
    32 #include "frontend/gui/ui/accountlist/accountlist.h"
    33 #include "frontend/gui/ui/addressbook/addressbook.h"
    34 #include "frontend/gui/ui/editaccount/editaccount.h"
    35 #include "frontend/gui/ui/editcontact/editcontact.h"
    36 #include "frontend/gui/ui/sendingdialog/sendingdialog.h"
    37 #include "frontend/gui/ui/settingsdialog/settingsdialog.h"
    38 #include "frontend/gui/ui/updatedialog/updatedialog.h"
     31#include "frontend/gui/ui/about.h"
     32#include "frontend/gui/ui/accountlist.h"
     33#include "frontend/gui/ui/addressbook.h"
    3934#include "frontend/gui/ui/completers/bettercompleter.h"
    4035#include "frontend/gui/ui/components/taskstatusbar.h"
     36#include "frontend/gui/ui/editaccount.h"
     37#include "frontend/gui/ui/editcontact.h"
    4138#include "frontend/gui/ui/models/aliascompletionmodel.h"
    4239#include "frontend/gui/ui/models/loadedaccountmodel.h"
     40#include "frontend/gui/ui/sendingdialog.h"
     41#include "frontend/gui/ui/settingsdialog.h"
     42#include "frontend/gui/ui/updatedialog.h"
    4343
    4444namespace UI {
  • frontend/gui/ui/settingsdialog.cpp

    r316 r317  
    2626#include "frontend/business/suffixmanager.h"
    2727#include "frontend/business/updatemanager.h"
    28 
    29 #include "frontend/gui/ui/updatedialog/updatedialog.h"
     28#include "frontend/gui/ui/updatedialog.h"
    3029
    3130namespace UI {
Note: See TracChangeset for help on using the changeset viewer.