diff --git a/manifest b/manifest index 98182ce..20fa945 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Address\sFossil\sweirdness\swhich\streats\sall\sclosed\sbranches\sas\sactive\stags\swith\sa\sspecial\s"closed"\sattribute -D 2015-07-23T17:22:30.253 +C Fixed\sQt\sruntime\swarning\scaused\sby\sautomatic\ssingals +D 2015-07-23T18:04:18.950 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -226,8 +226,8 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp d98c68af2fd5b0b4b6c2f292592d69a37e563215 -F src/MainWindow.h c819e6a574fedcdb1bc1a261443fd0d372233555 +F src/MainWindow.cpp 70decdfee231618e4abbd60c06f89965dd228165 +F src/MainWindow.h c4518a0ba8d5ba2a128449bd8a50adff8402049d F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79 @@ -254,7 +254,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P c3d03e6a79a457f42479b2338a5a6dd23b5e2a06 -R 35a54710df4f70f990b3f3b9578e5dcc +P 51d26d1e0912e6da939e9a48f0357847acd1501a +R d1dbf4f92c90f8a90e2f7898e933a55c U kostas -Z 7261d48d5b22b979158fe8f8dff2b73e +Z 4b21b92c6fa99b4f079e970f5db5f61b diff --git a/manifest.uuid b/manifest.uuid index 95dc232..c1673b6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -51d26d1e0912e6da939e9a48f0357847acd1501a \ No newline at end of file +193d2c862c9eda6235b4360da1130411ee619766 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 0f7fd39..c0cdc81 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -232,7 +232,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP { customActions[i] = new QAction(this); customActions[i]->setVisible(false); - connect(customActions[i], SIGNAL(triggered()), this, SLOT(on_actionCustomAction_triggered())); + connect(customActions[i], SIGNAL(triggered()), this, SLOT(onCustomActionTriggered())); customActions[i]->setData(i); customActions[i]->setShortcut(QKeySequence(QString("Ctrl+%0").arg(i+1))); } @@ -2896,7 +2896,7 @@ void MainWindow::invokeCustomAction(int actionId) } //------------------------------------------------------------------------------ -void MainWindow::on_actionCustomAction_triggered() +void MainWindow::onCustomActionTriggered() { QAction *action = qobject_cast(sender()); if(!action) diff --git a/src/MainWindow.h b/src/MainWindow.h index b3292fc..e9a9ac9 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -79,6 +79,7 @@ private slots: void onAbort(); void onSearchBoxTextChanged(const QString &text); void onSearch(); + void onCustomActionTriggered(); // Designer slots void on_actionRefresh_triggered(); @@ -135,7 +136,6 @@ private slots: void on_actionSetDefaultRemote_triggered(); void on_actionAddRemote_triggered(); void on_actionDeleteRemote_triggered(); - void on_actionCustomAction_triggered(); private: class MainWinUICallback : public UICallback