diff --git a/manifest b/manifest index ea718aa..277de8d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\sissue\swith\sdetached\sexecution\snot\sreturning\sthe\scorrect\sresult\sstatus\n -D 2015-08-14T10:42:39.221 +C Minor\sUI\stweaks +D 2015-08-14T10:43:09.775 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -231,7 +231,7 @@ F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp 02e95be5ebcd8970b3f63e3a2bcdfa269df41746 +F src/MainWindow.cpp f46ad6800657330ac6772dc1a512c262b60e6f59 F src/MainWindow.h f4cffbe4d360d30aa2eeaa25fc6d50d0a39c617f F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d @@ -256,11 +256,11 @@ F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712 F ui/CommitDialog.ui 1e5dafa742e9ae07ec937bcda8cda3297ddc6199 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/FslSettingsDialog.ui eb3d4cb764cab90b01e82922237d8c42d6ce1749 -F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 +F ui/MainWindow.ui f9774e6dddb9462d8072bffd6c511bee7f470b9d F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P 5e89247bf2fa2cf6d5720ddf51e091319ab66459 -R 095d87cb7fa113af20146a4ed0d80bc6 +P 28d8e8098a1f1d19ce8494c1926dad0490632b82 +R 0a71e4b8f8d8221784f984c25712dba7 U Kostas -Z d0dd174a392a7ed0b54c82c5439ed34b +Z ff23988d9eb6b4fa4d6dc2c91f7e6875 diff --git a/manifest.uuid b/manifest.uuid index 359d7b0..660f9c7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -28d8e8098a1f1d19ce8494c1926dad0490632b82 \ No newline at end of file +49797e154e77b27ff722edee9654e1b7d42a04cd \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 8649ac3..56981b8 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -284,7 +284,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP // Create SearchBox searchBox = new SearchBox(this); - searchBox->setPlaceholderText(tr("Find (%0)").arg(searchShortcut->key().toString())); + searchBox->setPlaceholderText(tr("Filter (%0)").arg(searchShortcut->key().toString())); searchBox->setMaximumWidth(450); ui->mainToolBar->addWidget(searchBox); diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui index 9607069..63a9459 100644 --- a/ui/MainWindow.ui +++ b/ui/MainWindow.ui @@ -282,8 +282,8 @@ - +