From 6ecf9b2e402eeaf186f3ce558616bc01175b7f8d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 30 Jun 2013 19:02:24 +0200 Subject: [PATCH] New free flags, refactorings. --- CMakeLists.txt | 1 - resources/graphics/flags/cs.png | Bin 984 -> 1416 bytes resources/graphics/flags/en.png | Bin 1690 -> 2785 bytes resources/text/COPYING_FLAGS | 7 --- src/gui/dynamicshortcutswidget.h | 3 +- src/gui/formabout.cpp | 9 ---- src/gui/formabout.ui | 72 +------------------------------ src/gui/formmain.cpp | 6 +-- src/gui/formmain.h | 17 ++++++-- src/gui/formsettings.cpp | 2 + src/gui/shortcutbutton.cpp | 30 ++++++------- 11 files changed, 37 insertions(+), 110 deletions(-) delete mode 100644 resources/text/COPYING_FLAGS diff --git a/CMakeLists.txt b/CMakeLists.txt index ef054eb4d..e2daa9454 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,7 +236,6 @@ set(APP_MISC resources/text/CHANGELOG resources/text/COPYING_GNU_GPL resources/text/COPYING_GNU_GPL_HTML - resources/text/COPYING_FLAGS ) # Wrap files, create moc files. diff --git a/resources/graphics/flags/cs.png b/resources/graphics/flags/cs.png index 7a4598046595581cf22e435d11965a2b9144491e..b50e69ec0cbf52a237831c9c9a1b59601ef3e02a 100644 GIT binary patch literal 1416 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 literal 1690 zcmV;L24(q)P)x(mpDug<;Sx4LNhr~l;HJ^P*c=H7FD=Xvh}FX#pR z-${TV7>kmV#gHXSAX$C!!@kSdkoz}eMSbSREBnTyd_WvzyB&SX%8)QCAGaD>p1Egy zQV)D=_zNxh2N5uPHU`X_XJP<+j(qr$Jt{E)*8crr4huuQ?E#LSsYPp>43p7=Gb0ZV zwp^g60V%_Jz_x!sR8fR~N(v7CS_ONv6RN60mNoFABy;vO8ITZRh2{KjFnD{zckp0T z-mFF6zR|u$T4zkHjX^;~4D6dW!5k8TPNeYt#Fz2QscICK)rkHR{3EG+%{;r6{YOj>w^sWCDDsI9kS z?ePW-h@XVF8qc9FBLjg`r(*Qreu#|>Kz439Za1`oYh^GD8VFUAcmx z&l5A^{oz}<2U3R)=(=bTRBtN|m0ZW^i}fh4YU1mRnkE%CM;mfWYH&Ir46{?B(U`Ln zEv2Ohn?4;Y=EmW`v441&64uGt1c}V|m7%f~y^Y)$an>Z1cxH#OrFEfhf|)RE0Q&U~MAn`w6tU(f z0npw~9lS7iP$&51ZHMINhi=Q413o?kz7o0QK$}zKX<>F;kRvWPbhzat>eP#pp@_li!RD!pPQ3uy5Fej?<>WI&dIr$m`6k zGq`%gMkW+)oEc`epepVWP~dbDi!v$mpd1qrT6De6f%N^&RPl3>e5VvQ2tb##G)x{5 z&udY2Iyv*OpV|u1%L}2InGh)FIYkxNU3iV_bQxBuwN+Jyk=Ky&a1L}lRZ`Lv9v-f@ zng?ft!N6J2tKMDa8%eI9s#cnt(d+PG-hM7(vZ5&MWX7^Ab7oXoS&8_81N}LGEq;DY z5iv0UwUmK2cnG}VV9=i~gF?Fr)}GYIWEUWwRNk5tR0f7QVX>g>^l7AuqCZc8)Y1Zh z@~NtqqpbsJ132sDsz@19lz;ROZg5gn~hxhGTL z&h9BFqoHD;DvzWBeLMy3{CEo3yOxWWfTW=sfZ=I}5Y_tz9IX;*W=3847T{?%V&>Q= zq>he)VrxR((xs3oVqqIMLT#hT$Gp*j*^eGY?XqR?89oBJ-4c9ycvmh4E*)&|tZ)ZDSG8+wl9G%XlZP0GAt7gsxeGAR1uCC7)qq&^gQ;8P0oO z1ED$UngfRRgGfeHxIc1NC1K9E-mvHA;o681F!zl`cESRT%esonTD$H6AAcJ2lTV@f zZo_-&Mfi5xd02)FLqt&#q?&3B-}WVPrgTMUu#aws0g&ARNYru)=6vu9a#kdwyG24( zYAWhCY(V2zYcT5fAZ*Pm*N<1`iK?Z5c~8t_r=&&ifm6bFJ1)@uAP*Pn6}+@=9fIf2 zhk0=tHg`FTS?`8HVW1T^0KG!2Sic|+(cxp>JSp-^RVso!x%xGy)~nBcVKPE&|clHm2| kWPEPK+ULQG{{=7TU&?$+V+dc6xc~qF07*qoM6N<$g6) actions); private: diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index aca233200..4818b9532 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -26,15 +26,6 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) } file.close(); - file.setFileName(APP_INFO_PATH + "/COPYING_FLAGS"); - if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - m_ui->m_txtLicenseFlags->setText(str.readAll()); - } - else { - m_ui->m_txtLicenseFlags->setText(tr("License not found.")); - } - file.close(); - file.setFileName(APP_INFO_PATH + "/CHANGELOG"); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { m_ui->m_txtChangelog->setText(str.readAll()); diff --git a/src/gui/formabout.ui b/src/gui/formabout.ui index d43d10700..25d605d89 100644 --- a/src/gui/formabout.ui +++ b/src/gui/formabout.ui @@ -170,7 +170,7 @@ p, li { white-space: pre-wrap; } 0 0 685 - 203 + 230 @@ -228,76 +228,6 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - 0 - 0 - 685 - 203 - - - - Go Squared License (applies to graphical flags) - - - Go Squared License (for flags in settings) - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - DejaVu Sans Mono - - - - - - - QFrame::NoFrame - - - Qt::ScrollBarAlwaysOff - - - QTextEdit::AutoNone - - - false - - - QTextEdit::WidgetWidth - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 29c9435b7..c502977cf 100644 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -11,13 +11,13 @@ #include "qtsingleapplication/qtsingleapplication.h" -FormMain *FormMain::m_this; +FormMain *FormMain::s_instance; FormMain::FormMain(QWidget *parent) : QMainWindow(parent), m_ui(new Ui::FormMain) { m_ui->setupUi(this); // Initialize singleton. - m_this = this; + s_instance = this; // Establish connections. createConnections(); @@ -35,7 +35,7 @@ FormMain::~FormMain() { } FormMain *FormMain::getInstance() { - return m_this; + return s_instance; } QMenu *FormMain::getTrayMenu() { diff --git a/src/gui/formmain.h b/src/gui/formmain.h index 20fd8ab55..cd648e52b 100644 --- a/src/gui/formmain.h +++ b/src/gui/formmain.h @@ -24,18 +24,29 @@ class FormMain : public QMainWindow { static FormMain *getInstance(); protected: + // Creates all needed menus and sets them up. void prepareMenus(); - void createConnections(); - void closeEvent(QCloseEvent *event); + // Creates needed connections for this window. + void createConnections(); + + // Event handler reimplementations. + void closeEvent(QCloseEvent *event); bool event(QEvent *event); // Sets up proper icons for this widget. + // NOTE: All permanent widgets should implement this + // kind of method and catch ThemeFactoryEvent::type() in its event handler. void setupIcons(); public slots: + // Processes incoming message from another RSS Guard instance. void processExecutionMessage(const QString &message); + + // Quits the application. void quit(); + + // Displays window on top or switches its visibility. void display(); void switchVisibility(); @@ -48,7 +59,7 @@ class FormMain : public QMainWindow { Ui::FormMain *m_ui; QMenu *m_trayMenu; - static FormMain *m_this; + static FormMain *s_instance; }; #endif // FORMMAIN_H diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index fff323c04..fe505f26b 100644 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -54,6 +54,8 @@ void FormSettings::saveSettings() { saveShortcuts(); saveInterface(); saveLanguage(); + + Settings::getInstance()->checkSettings(); } void FormSettings::loadLanguage() { diff --git a/src/gui/shortcutbutton.cpp b/src/gui/shortcutbutton.cpp index 0922add2e..f287e16c8 100644 --- a/src/gui/shortcutbutton.cpp +++ b/src/gui/shortcutbutton.cpp @@ -40,16 +40,16 @@ ShortcutButton::~ShortcutButton() { } void ShortcutButton::keyPressEvent(QKeyEvent *event) { - int keyQt = event->key(); + int pressed_key = event->key(); - if (keyQt == -1) { + if (pressed_key == -1) { m_catcher->doneRecording(); } - Qt::KeyboardModifiers newModifiers = event->modifiers() & + Qt::KeyboardModifiers new_modifiers = event->modifiers() & (Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META); - if (m_catcher->m_isRecording == false && (keyQt == Qt::Key_Return || keyQt == Qt::Key_Space)) { + if (m_catcher->m_isRecording == false && (pressed_key == Qt::Key_Return || pressed_key == Qt::Key_Space)) { return; } @@ -58,9 +58,9 @@ void ShortcutButton::keyPressEvent(QKeyEvent *event) { } event->accept(); - m_catcher->m_modifierKeys = newModifiers; + m_catcher->m_modifierKeys = new_modifiers; - switch(keyQt) { + switch(pressed_key) { case Qt::Key_AltGr: return; case Qt::Key_Shift: @@ -75,19 +75,19 @@ void ShortcutButton::keyPressEvent(QKeyEvent *event) { } // We now have a valid key press. - if (keyQt) { - if ((keyQt == Qt::Key_Backtab) && (m_catcher->m_modifierKeys & Qt::SHIFT)) { - keyQt = Qt::Key_Tab | m_catcher->m_modifierKeys; + if (pressed_key) { + if ((pressed_key == Qt::Key_Backtab) && (m_catcher->m_modifierKeys & Qt::SHIFT)) { + pressed_key = Qt::Key_Tab | m_catcher->m_modifierKeys; } else { - keyQt |= m_catcher->m_modifierKeys; + pressed_key |= m_catcher->m_modifierKeys; } if (m_catcher->m_numKey == 0) { - m_catcher->m_currentSequence = QKeySequence(keyQt); + m_catcher->m_currentSequence = QKeySequence(pressed_key); } - m_catcher->m_numKey++; // increment nuber of pressed keys + m_catcher->m_numKey++; if (m_catcher->m_numKey >= 4) { m_catcher->doneRecording(); @@ -111,11 +111,11 @@ void ShortcutButton::keyReleaseEvent(QKeyEvent *event) { event->accept(); - Qt::KeyboardModifiers newModifiers = event->modifiers() & + Qt::KeyboardModifiers new_modifiers = event->modifiers() & (Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META); - if ((newModifiers & m_catcher->m_modifierKeys) < m_catcher->m_modifierKeys) { - m_catcher->m_modifierKeys = newModifiers; + if ((new_modifiers & m_catcher->m_modifierKeys) < m_catcher->m_modifierKeys) { + m_catcher->m_modifierKeys = new_modifiers; m_catcher->controlModifierlessTimout(); m_catcher->updateDisplayShortcut(); }