From 01f740276bc64682e76f34a938c09f43775946f2 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 24 Aug 2016 13:28:28 +0200 Subject: [PATCH] ui: removed auto refresh --- bin/app/data/gui/main.css | 4 --- .../data/gui/refresh_view/refresh_view.css | 11 ++---- bin/app/data/gui/window/window.css | 1 - src/lib/CMakeLists.txt | 1 - .../controller/RefreshController.cpp | 16 --------- .../component/controller/RefreshController.h | 10 ------ .../type/MessageAutoRefreshChanged.h | 34 ------------------- src/lib_gui/qt/element/QtRefreshBar.cpp | 22 ------------ src/lib_gui/qt/element/QtRefreshBar.h | 2 -- src/lib_gui/qt/window/QtIndexingDialog.cpp | 1 + 10 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 src/lib/utility/messaging/type/MessageAutoRefreshChanged.h diff --git a/bin/app/data/gui/main.css b/bin/app/data/gui/main.css index fb588f9a..cb2084a4 100644 --- a/bin/app/data/gui/main.css +++ b/bin/app/data/gui/main.css @@ -3,7 +3,3 @@ QToolTip { color: black; font-size: pt; } - -* { - font-family: "Roboto"; -} diff --git a/bin/app/data/gui/refresh_view/refresh_view.css b/bin/app/data/gui/refresh_view/refresh_view.css index 91dd6061..8dd5f927 100644 --- a/bin/app/data/gui/refresh_view/refresh_view.css +++ b/bin/app/data/gui/refresh_view/refresh_view.css @@ -22,12 +22,7 @@ QPushButton:pressed { } #refresh_button { - border-bottom-left-radius: 12px; - border-top-left-radius: 12px; - margin-right: 2px; -} - -#auto_refresh_button { - border-bottom-right-radius: 12px; - border-top-right-radius: 12px; + /*border-bottom-left-radius: 12px;*/ + /*border-top-left-radius: 12px;*/ + border-radius: 12px; } diff --git a/bin/app/data/gui/window/window.css b/bin/app/data/gui/window/window.css index 021f45b7..3992c23a 100644 --- a/bin/app/data/gui/window/window.css +++ b/bin/app/data/gui/window/window.css @@ -1,6 +1,5 @@ * { font-size: 12pt; - font-family: "Roboto"; } #title { diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index fa2b6c41..72534d12 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -250,7 +250,6 @@ add_files( utility/messaging/type/MessageActivateTokenIds.h utility/messaging/type/MessageActivateTokens.h utility/messaging/type/MessageActivateWindow.h - utility/messaging/type/MessageAutoRefreshChanged.h utility/messaging/type/MessageChangeFileView.h utility/messaging/type/MessageClearErrorCount.h utility/messaging/type/MessageCodeReference.h diff --git a/src/lib/component/controller/RefreshController.cpp b/src/lib/component/controller/RefreshController.cpp index 22bb45e8..c276a3e2 100644 --- a/src/lib/component/controller/RefreshController.cpp +++ b/src/lib/component/controller/RefreshController.cpp @@ -1,11 +1,8 @@ #include "component/controller/RefreshController.h" -#include "utility/messaging/type/MessageRefresh.h" - #include "component/view/RefreshView.h" RefreshController::RefreshController() - : m_autoRefreshEnabled(false) { } @@ -17,19 +14,6 @@ void RefreshController::clear() { } -void RefreshController::handleMessage(MessageAutoRefreshChanged* message) -{ - m_autoRefreshEnabled = message->enabled; -} - -void RefreshController::handleMessage(MessageWindowFocus* message) -{ - if (m_autoRefreshEnabled) - { - MessageRefresh().dispatch(); - } -} - RefreshView* RefreshController::getView() { return Controller::getView(); diff --git a/src/lib/component/controller/RefreshController.h b/src/lib/component/controller/RefreshController.h index a5e62b7a..1aa416ef 100644 --- a/src/lib/component/controller/RefreshController.h +++ b/src/lib/component/controller/RefreshController.h @@ -2,16 +2,11 @@ #define REFRESH_CONTROLLER_H #include "component/controller/Controller.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageAutoRefreshChanged.h" -#include "utility/messaging/type/MessageWindowFocus.h" class RefreshView; class RefreshController : public Controller - , public MessageListener - , public MessageListener { public: RefreshController(); @@ -20,12 +15,7 @@ public: virtual void clear(); private: - virtual void handleMessage(MessageAutoRefreshChanged* message); - virtual void handleMessage(MessageWindowFocus* message); - RefreshView* getView(); - - bool m_autoRefreshEnabled; }; #endif // REFRESH_CONTROLLER_H diff --git a/src/lib/utility/messaging/type/MessageAutoRefreshChanged.h b/src/lib/utility/messaging/type/MessageAutoRefreshChanged.h deleted file mode 100644 index 1ac372af..00000000 --- a/src/lib/utility/messaging/type/MessageAutoRefreshChanged.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef MESSAGE_AUTO_REFRESH_CHANGED_H -#define MESSAGE_AUTO_REFRESH_CHANGED_H - -#include "utility/messaging/Message.h" - -class MessageAutoRefreshChanged: public Message -{ -public: - MessageAutoRefreshChanged(bool enabled) - : enabled(enabled) - { - } - - static const std::string getStaticType() - { - return "MessageAutoRefreshChanged"; - } - - virtual void print(std::ostream& os) const - { - if (enabled) - { - os << "enabled"; - } - else - { - os << "disabled"; - } - } - - bool enabled; -}; - -#endif // MESSAGE_AUTO_REFRESH_CHANGED_H diff --git a/src/lib_gui/qt/element/QtRefreshBar.cpp b/src/lib_gui/qt/element/QtRefreshBar.cpp index 04446410..5cc5d2cd 100644 --- a/src/lib_gui/qt/element/QtRefreshBar.cpp +++ b/src/lib_gui/qt/element/QtRefreshBar.cpp @@ -3,7 +3,6 @@ #include #include -#include "utility/messaging/type/MessageAutoRefreshChanged.h" #include "utility/messaging/type/MessageRefresh.h" #include "utility/ResourcePaths.h" @@ -29,21 +28,12 @@ QtRefreshBar::QtRefreshBar() m_refreshButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac layout->addWidget(m_refreshButton); - m_autoRefreshButton = new QPushButton(this); - m_autoRefreshButton->setObjectName("auto_refresh_button"); - m_autoRefreshButton->setCheckable(true); - m_autoRefreshButton->setToolTip("automatic refresh on window focus"); - m_autoRefreshButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac - layout->addWidget(m_autoRefreshButton); - if (isTrial()) { m_refreshButton->setEnabled(false); - m_autoRefreshButton->setEnabled(false); } connect(m_refreshButton, SIGNAL(clicked()), this, SLOT(refreshClicked())); - connect(m_autoRefreshButton, SIGNAL(clicked()), this, SLOT(autoRefreshClicked())); refreshStyle(); } @@ -57,27 +47,15 @@ void QtRefreshBar::refreshClicked() MessageRefresh().dispatch(); } -void QtRefreshBar::autoRefreshClicked() -{ - MessageAutoRefreshChanged(m_autoRefreshButton->isChecked()).dispatch(); -} - void QtRefreshBar::refreshStyle() { float height = std::max(ApplicationSettings::getInstance()->getFontSize() + 16, 30); m_refreshButton->setFixedHeight(height); - m_autoRefreshButton->setFixedHeight(height); std::string map = ResourcePaths::getGuiPath() + "refresh_view/images/refresh.png"; m_refreshButton->setIcon(utility::colorizePixmap( QPixmap(map.c_str()), ColorScheme::getInstance()->getColor("search/button/icon").c_str() )); - - map = ResourcePaths::getGuiPath() + "refresh_view/images/auto_refresh.png"; - m_autoRefreshButton->setIcon(utility::colorizePixmap( - QPixmap(map.c_str()), - ColorScheme::getInstance()->getColor("search/button/icon").c_str() - )); } diff --git a/src/lib_gui/qt/element/QtRefreshBar.h b/src/lib_gui/qt/element/QtRefreshBar.h index 22723402..64fac318 100644 --- a/src/lib_gui/qt/element/QtRefreshBar.h +++ b/src/lib_gui/qt/element/QtRefreshBar.h @@ -18,11 +18,9 @@ public: private slots: void refreshClicked(); - void autoRefreshClicked(); private: QPushButton* m_refreshButton; - QPushButton* m_autoRefreshButton; }; #endif // QT_REFRESH_BAR_H diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp index 2773ee29..8efac3b4 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.cpp +++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp @@ -303,6 +303,7 @@ void QtIndexingDialog::addMessageLabel(QBoxLayout* layout) m_messageLabel = new QLabel(); m_messageLabel->setObjectName("message"); m_messageLabel->setAlignment(Qt::AlignRight); + m_messageLabel->setWordWrap(true); layout->addWidget(m_messageLabel, 0, Qt::AlignRight); }