diff --git a/RepoDialog.cpp b/RepoDialog.cpp deleted file mode 100644 index b5959da..0000000 --- a/RepoDialog.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "RepoDialog.h" -#include "ui_RepoDialog.h" - -RepoDialog::RepoDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::RepoDialog) -{ - ui->setupUi(this); -} - -RepoDialog::~RepoDialog() -{ - delete ui; -} diff --git a/RepoDialog.h b/RepoDialog.h deleted file mode 100644 index 163027c..0000000 --- a/RepoDialog.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef REPODIALOG_H -#define REPODIALOG_H - -#include - -namespace Ui { - class RepoDialog; -} - -class RepoDialog : public QDialog -{ - Q_OBJECT - -public: - explicit RepoDialog(QWidget *parent = 0); - ~RepoDialog(); - -private: - Ui::RepoDialog *ui; -}; - -#endif // REPODIALOG_H diff --git a/RepoDialog.ui b/RepoDialog.ui deleted file mode 100644 index 4be1825..0000000 --- a/RepoDialog.ui +++ /dev/null @@ -1,150 +0,0 @@ - - - RepoDialog - - - - 0 - 0 - 436 - 166 - - - - Dialog - - - - - 9 - 9 - 66 - 17 - - - - Push URL - - - - - - 129 - 9 - 144 - 25 - - - - - - - 9 - 40 - 99 - 17 - - - - Graphical Diff - - - - - - 129 - 40 - 144 - 25 - - - - - - - 9 - 71 - 114 - 17 - - - - Graphical Merge - - - - - - 129 - 71 - 144 - 25 - - - - - - - 129 - 102 - 90 - 22 - - - - Autosync - - - - - - 9 - 130 - 176 - 27 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - buttonBox - accepted() - RepoDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - RepoDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/fuel.pro b/fuel.pro index 1557f31..733e2e4 100644 --- a/fuel.pro +++ b/fuel.pro @@ -1,55 +1,55 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2011-08-01T00:17:18 -# -#------------------------------------------------- - -QT += core gui - -TARGET = Fuel -TEMPLATE = app - -# OSX Icon -ICON = icons/fuel.icns - -# Win Icon -RC_FILE = fuel.rc - -SOURCES += main.cpp\ - MainWindow.cpp \ - CommitDialog.cpp \ - FileActionDialog.cpp \ - RepoDialog.cpp \ - SettingsDialog.cpp - -HEADERS += MainWindow.h \ - CommitDialog.h \ - FileActionDialog.h \ - RepoDialog.h \ - SettingsDialog.h - -FORMS += MainWindow.ui \ - CommitDialog.ui \ - FileActionDialog.ui \ - RepoDialog.ui \ - SettingsDialog.ui - -RESOURCES += \ - resources.qrc - - - - - - - - - - - - - - - - - +#------------------------------------------------- +# +# Project created by QtCreator 2011-08-01T00:17:18 +# +#------------------------------------------------- + +QT += core gui + +TARGET = Fuel +TEMPLATE = app + +# OSX Icon +ICON = icons/fuel.icns + +# Win Icon +RC_FILE = fuel.rc + +SOURCES += main.cpp\ + MainWindow.cpp \ + CommitDialog.cpp \ + FileActionDialog.cpp \ + SettingsDialog.cpp + +HEADERS += MainWindow.h \ + CommitDialog.h \ + FileActionDialog.h \ + SettingsDialog.h + +FORMS += MainWindow.ui \ + CommitDialog.ui \ + FileActionDialog.ui \ + SettingsDialog.ui + +RESOURCES += \ + resources.qrc + + + + + + + + + + + + + + + + + + + + diff --git a/manifest b/manifest index 7c7c6c9..3eab9cf 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\sFolder\sView\snow\sproperly\ssorts\sfolder\sentries\nMultiple\sselection\ssupport\sin\sthe\sFolder\sView.\sWhen\smultiple\sfolders\sare\sselected,\sthe\sfile\sview\sswitches\sto\sList\smode\n -D 2011-10-18T13:21:14.225 +C Removed\sunused\sRepoDialog +D 2011-10-19T16:24:42.452 F CommitDialog.cpp 8965e52d077c300cf1acb1b16fb2dcca5c7070f8 F CommitDialog.h a9596d99865cf312b419d01d51334ffc916f5508 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154 @@ -9,13 +9,10 @@ F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 F MainWindow.cpp 7d9f8914b3a16e3ab72e255f40b4c13f4e32cca3 F MainWindow.h 632c5ba933ed77bf9dbe144224e1e6c16fec83e2 F MainWindow.ui c00f9d35aaf659fafee25a5504bd23b0b2ec4eb5 -F RepoDialog.cpp 8f20e1511526973555c774350ec413dcecf51c9e -F RepoDialog.h a958c5f98f1e6882bf41dbdd2e4df3cb89700802 -F RepoDialog.ui be7b18199c04a3003f3c7534a616cd7441b7bb0c F SettingsDialog.cpp 4e8d12cd19c19590c68eaa3516441d21d08f0ee6 F SettingsDialog.h c2a7828466a5459d8c08a759f0ddf3e368357e80 F SettingsDialog.ui 292eea79612f0daa48b67436fcf812f48ff5af54 -F fuel.pro 295944fd817518c7c2412c5e52ce5ecad11dd8f8 +F fuel.pro b304761003917ba0790be1b62d537642a7e40adb F fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79 F icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8 F icons/Adobe\sIllustrator\sCS3\sDocument-01.png 2e44e933d58eefee7ccfa1650fed4ceadcf3c2be @@ -175,7 +172,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 -P 1fb5f07f1b18c3d7f9cf16f54cd790294001940f -R 0460063d9dd585b587a4d174a7da0ca4 +P a2cba45b7a250bb1ad3ba4beb3a3a98dc7566ce0 +R faf331f106f12f44e5fa947482005b9e U kostas -Z 0eee338bd957dfec8c6a14b15b9a11ba +Z c4bc02d7e2163cc0f4371f837a7d7e0f diff --git a/manifest.uuid b/manifest.uuid index 174fa72..a6fa2bf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a2cba45b7a250bb1ad3ba4beb3a3a98dc7566ce0 \ No newline at end of file +fb85ae054f85e81e64e9d534fe502959f7f1fa2e \ No newline at end of file