diff --git a/MainWindow.cpp b/MainWindow.cpp index 7052472..2801be4 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1832,6 +1832,12 @@ void MainWindow::on_actionOpenFolder_triggered() return; QModelIndex index = selection.indexes().at(0); + on_treeView_doubleClicked(index); +} + +//------------------------------------------------------------------------------ +void MainWindow::on_treeView_doubleClicked(const QModelIndex &index) +{ QString target = repoDirModel.data(index, REPODIRMODEL_ROLE_PATH).toString(); target = getCurrentWorkspace() + PATH_SEP + target; @@ -2003,4 +2009,3 @@ _exit: refresh(); } - diff --git a/MainWindow.h b/MainWindow.h index b513ad6..55889c3 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -191,6 +191,7 @@ private slots: void on_actionHistory_triggered(); void on_actionClearLog_triggered(); void on_tableView_doubleClicked(const QModelIndex &index); + void on_treeView_doubleClicked(const QModelIndex &index); void on_actionOpenFile_triggered(); void on_actionPush_triggered(); void on_actionPull_triggered(); diff --git a/SettingsDialog.ui b/SettingsDialog.ui index 524eb04..d3ec7da 100644 --- a/SettingsDialog.ui +++ b/SettingsDialog.ui @@ -9,8 +9,8 @@ 0 0 - 544 - 186 + 526 + 211 @@ -19,109 +19,218 @@ true - - - - - Fossil Path + + + + + 0 + + + + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + + + Application + + + + + + + 100 + 0 + + + + Fossil Path + + + + + + + + + Path to the fossil executable. Leave blank to use the default fossil + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + ... + + + + + + + + + + 100 + 0 + + + + Graphical Diff + + + + + + + + + Path to graphical diff tool + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + ... + + + + + + + + + + 100 + 0 + + + + Graphical Merge + + + + + + + + + Path to the graphical merge tool + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + ... + + + + + + + + + + + :/icons/icons/Book-01.png:/icons/icons/Book-01.png + + + Repository + + + + + + + 100 + 0 + + + + Ignore List + + + + + + + + 0 + 0 + + + + A comma separated list of paths to ignore in fossil operations + + + + + + + + 100 + 0 + + + + Remote Url + + + + + + + + 0 + 0 + + + + The repote url use push changes + + + + + - - - - - - - - - - 0 - 0 - - - - ... - - - - - - - - - Graphical Diff - - - - - - - - - - - - - 0 - 0 - - - - ... - - - - - - - - - Graphical Merge - - - - - - - - - - - - - 0 - 0 - - - - ... - - - - - - - - - Ignore List - - - - - - - - - - Remote Url - - - - - - - + Qt::Horizontal @@ -132,16 +241,10 @@ - label_2 - label_3 - label - label_4 - lineIgnore - buttonBox - lineRemoteURL - label_5 - + + + buttonBox diff --git a/manifest b/manifest index c5398a2..4e02b19 100644 --- a/manifest +++ b/manifest @@ -1,17 +1,17 @@ -C Integrated\sall\sfossil/fuel\soptions\sinto\sthe\sSettings\sdialog\nrunFossil\snow\suses\sa\sbitfield\sto\scontrol\sexecution\soptions\nSettings\smanagement\snow\ssucks\sless,\s(but\sstill\senough\ssuckage\sremains)\n\n -D 2011-10-19T16:30:12.635 +C Beautified\sthe\ssettings\sdialog\nDouble-clicking\sa\sfolder\sin\sthe\sbehaves\slike\sopen\sfolder\n +D 2011-10-20T15:36:18.415 F CommitDialog.cpp 8965e52d077c300cf1acb1b16fb2dcca5c7070f8 F CommitDialog.h a9596d99865cf312b419d01d51334ffc916f5508 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154 F FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8 F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 -F MainWindow.cpp 35de92266b4051a687cb0cd400dc668f1890a8ce -F MainWindow.h 793882064fc9572744f2016ed559f7b9d26632ec +F MainWindow.cpp 149a4bdf9ae5f372f3026294c311b53470119a4e +F MainWindow.h c16460dfb72df649e5c3bd6057c46d5ceb559106 F MainWindow.ui 7f9e5cda55cffd5da8c01de7729a1806126c0d6b F SettingsDialog.cpp a386f03a13115b8179361344c830bcdb2c319476 F SettingsDialog.h 079e869f60b37feac78198afe0dfd5b75eee9add -F SettingsDialog.ui 8e5b742e889665273d11980959f390ec98dacc06 +F SettingsDialog.ui 05bc501e63fa74ce3d285ccfdd8c94382e558f32 F fuel.pro b304761003917ba0790be1b62d537642a7e40adb F fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79 F icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8 @@ -172,7 +172,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 -P fb85ae054f85e81e64e9d534fe502959f7f1fa2e -R 5776c676c29c7c55718b710700e50136 +P 91c5a65b7e4ca4801a6d7632abd7982d2063a1f3 +R b1e75a926cff0a17e96ba42e01dc5da3 U kostas -Z 50978861702a0b2ec83192ce7566f1c8 +Z df7a5182fb8be64251d47442ec7c00a8 diff --git a/manifest.uuid b/manifest.uuid index 3a661ba..3f442a3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -91c5a65b7e4ca4801a6d7632abd7982d2063a1f3 \ No newline at end of file +8a4fbbb14628b2dc53b8d46a35a3b4f43182db9c \ No newline at end of file