diff --git a/CMakeLists.txt b/CMakeLists.txt index b1ee387..d218388 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.2) project (whyblocked - VERSION 0.12.1 + VERSION 0.12.2 LANGUAGES CXX ) diff --git a/packages.CMakeLists.txt b/packages.CMakeLists.txt index 0f5f40f..2c8f8c3 100644 --- a/packages.CMakeLists.txt +++ b/packages.CMakeLists.txt @@ -1,8 +1,8 @@ # Packages set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -set(CPACK_PACKAGE_VERSION_MAJOR ${mastodon-cpp_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${mastodon-cpp_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${mastodon-cpp_VERSION_PATCH}) +set(CPACK_PACKAGE_VERSION_MAJOR ${${CMAKE_PROJECT_NAME}_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${${CMAKE_PROJECT_NAME}_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${${CMAKE_PROJECT_NAME}_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION ${whyblocked_VERSION}) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Whyblocked reminds you why you blocked someone.") set(CPACK_PACKAGE_CONTACT "tastytea ") diff --git a/src/interface_qt.cpp b/src/interface_qt.cpp index b75d894..396ae7e 100644 --- a/src/interface_qt.cpp +++ b/src/interface_qt.cpp @@ -17,8 +17,6 @@ #include #include #include -#include -#include #include #include #include @@ -89,6 +87,8 @@ MainWindow::MainWindow(QMainWindow *parent) } populate_tableview(); + statusBar()->showMessage(tr("Try dragging an account from your webbrowser " + "into this window.")); } MainWindow::~MainWindow() @@ -171,8 +171,6 @@ void MainWindow::populate_tableview() QString::fromStdString(std::get<2>(line))); } } - - statusBar()->showMessage(tr("Database loaded.")); } void MainWindow::add_row(const QString &user, const int &blocked, @@ -240,15 +238,14 @@ void MainWindow::remove() { const string user = row.data().toString().toStdString(); database::remove(user); - statusBar()->showMessage(tr("Removed %1 from database.") - .arg(QString::fromStdString(user))); _model->removeRow(row.row()); } label_receipts->clear(); } else { - statusBar()->showMessage(tr("Select data to remove.")); + QMessageBox::warning(this, tr("Nothing selected"), + tr("Please select entries to remove.")); } } @@ -410,9 +407,6 @@ void DialogAdd::accept() database::add_receipt(data.user, receipt); } - _parent->statusBar()->showMessage(tr("Added %1 to database.") - .arg(QString::fromStdString(data.user))); - delete this; } diff --git a/src/whyblocked_add.ui b/src/whyblocked_add.ui index 16bf055..2f70189 100644 --- a/src/whyblocked_add.ui +++ b/src/whyblocked_add.ui @@ -167,6 +167,9 @@ + + You can drag URLs in here + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked diff --git a/translations/whyblocked_de.ts b/translations/whyblocked_de.ts index c74b43a..0df554f 100644 --- a/translations/whyblocked_de.ts +++ b/translations/whyblocked_de.ts @@ -69,14 +69,14 @@ - - Insert receipt here. - Beleg hier einfügen. + + You can drag URLs in here + Du kannst URLs hier hineinziehen - - Added %1 to database. - %1 zur Datenbank hinzugefügt. + + Insert receipt here. + Beleg hier einfügen. @@ -188,7 +188,7 @@ - + Edit entry Eintrag bearbeiten @@ -208,52 +208,52 @@ Begründung - - Database loaded. - Datenbank geladen. + + Try dragging an account from your webbrowser into this window. + Versuche, einen account von deinem webbrowser in dieses fenster zu ziehen. - + blocked blockiert - + silenced gedämpft - + Invalid selection Ungültige Auswahl - + Please select only 1 entry to edit. Bitte nur 1 Eintrag zum bearbeiten auswählen. - - Removed %1 from database. - %1 aus der Datenbank gelöscht. + + Nothing selected + Nichts ausgewählt - - Select data to remove. - Wähle Daten zum löschen aus. + + Please select entries to remove. + Bitte wähle einträge aus, die gelöscht werden sollen. - + About Whyblocked Über Whyblocked - + <p><b>Whyblocked</b> %1</p><p>Reminds you why you blocked someone.</p><p>Sourcecode: <a href="https://schlomp.space/tastytea/whyblocked">https://schlomp.space/tastytea/whyblocked</a></p><p><small>Copyright © 2018 <a href="mailto:tastytea@tastytea.de">tastytea</a>.<br>Licence GPLv3: <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPL version 3</a>.<br>This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.</small></p> <p><b>Whyblocked</b> %1</p><p>Erinnert dich, warum du jemanden blockiertest.</p><p>Quelltext: <a href="https://schlomp.space/tastytea/whyblocked">https://schlomp.space/tastytea/whyblocked</a></p><p><small>Copyright © 2018 <a href="mailto:tastytea@tastytea.de">tastytea</a>.<br>Lizenz GPLv3: <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPL version 3</a>.<br>Für dieses Programm besteht KEINERLEI GARANTIE. Dies ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.</small></p> - + Receipts: Belege: diff --git a/translations/whyblocked_en.ts b/translations/whyblocked_en.ts index 9ef61b2..518887f 100644 --- a/translations/whyblocked_en.ts +++ b/translations/whyblocked_en.ts @@ -69,13 +69,13 @@ - - Insert receipt here. + + You can drag URLs in here - - Added %1 to database. + + Insert receipt here. @@ -188,7 +188,7 @@ - + Edit entry @@ -208,52 +208,52 @@ - - Database loaded. + + Try dragging an account from your webbrowser into this window. - + blocked - + silenced - + Invalid selection - + Please select only 1 entry to edit. - - Removed %1 from database. + + Nothing selected - - Select data to remove. + + Please select entries to remove. - + About Whyblocked - + <p><b>Whyblocked</b> %1</p><p>Reminds you why you blocked someone.</p><p>Sourcecode: <a href="https://schlomp.space/tastytea/whyblocked">https://schlomp.space/tastytea/whyblocked</a></p><p><small>Copyright © 2018 <a href="mailto:tastytea@tastytea.de">tastytea</a>.<br>Licence GPLv3: <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPL version 3</a>.<br>This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.</small></p> - + Receipts: