From b1258d48feeb703b7a1d12038d7221c6c58b49e1 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 12 Sep 2014 07:12:33 +0200 Subject: [PATCH] Added blau skin, some refactoring. --- resources/skins/base/blau.xml | 12 +++++ resources/skins/base/images/checkbox.png | Bin 0 -> 343 bytes resources/skins/base/images/down_arrow.png | Bin 0 -> 1008 bytes resources/text/CHANGELOG | 1 + src/gui/formmain.cpp | 53 --------------------- src/gui/formmain.h | 15 ++---- src/miscellaneous/application.cpp | 53 ++++++++++++++++++++- src/miscellaneous/application.h | 9 +++- 8 files changed, 75 insertions(+), 68 deletions(-) create mode 100644 resources/skins/base/blau.xml create mode 100644 resources/skins/base/images/checkbox.png create mode 100644 resources/skins/base/images/down_arrow.png diff --git a/resources/skins/base/blau.xml b/resources/skins/base/blau.xml new file mode 100644 index 000000000..c2c9d6083 --- /dev/null +++ b/resources/skins/base/blau.xml @@ -0,0 +1,12 @@ + + + blau + + Martin Rotter + rotter.martinos@gmail.com + + + PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSxyZ2JhKDk5LDEzNSwyMjksMSkpLCBjb2xvci1zdG9wKDEwMCUscmdiYSg2NCwxMDksMjM2LDEpKSk7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIGEgew0KICAgICAgICBjb2xvcjogd2hpdGU7DQogICAgICB9DQoNCiAgICAgIC5jb250ZW50IHsNCiAgICAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIGdyYXk7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCgkJY29sb3I6ICNlZWVlZWU7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgcGFkZGluZy10b3A6IDEycHg7DQogICAgICB9DQogICAgICANCiAgICAgIC5jb250YWluZXIgew0KCQlmb250LWZhbWlseTogIlRyZWJ1Y2hldCBNUyIsIEhlbHZldGljYSwgc2Fucy1zZXJpZjsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg== + ICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+DQogICAgICA8ZGl2IGNsYXNzPSJoZWFkZXIiPg0KICAgICAgICA8ZGl2IGNsYXNzPSJoZWFkZXJ0ZXh0Ij4NCiAgICAgICAgICAlMQ0KICAgICAgICA8L2Rpdj4NCiAgICAgICAgJTIgKCU1KQ0KICAgICAgICA8YnI+DQogICAgICAgIDxhIGhyZWY9IiUzIj4NCiAgICAgICAgICAlMw0KICAgICAgICA8L2E+DQogICAgICA8L2Rpdj4NCiAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPg0KICAgICAgICAlNCANCiAgICAgIDwvZGl2Pg0KICAgIDwvZGl2Pg== + /* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover {
  border-radius: 2px;
  border: 1px solid gray;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #595959;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #569de5;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #569de5;
}

QMenuBar::item:pressed {
  background: #444;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #212121, stop:0.4 #343434 );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: #000000;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

/* QComboBox */
QComboBox {
  selection-background-color: #569de5;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 0.5 #447cb5, stop: 1 #569de5);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 1 #447cb5);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 1 #447cb5);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 0.5 #447cb5, stop: 1 #569de5);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #569de5, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #569de5
} + \ No newline at end of file diff --git a/resources/skins/base/images/checkbox.png b/resources/skins/base/images/checkbox.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a9aa3b52dc02e6e117747a9ac9d9467526a4f7 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{!3Opi<85sDEfH31!Z9ZwBphB`o zkS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0x&hVR^>lFzskjx>x6!Y~ zL82x7y^qd`n>xG^0n*%uf2ox3~Sc{nxWy^uZGQQwlaH4B=bcp9+~j`r=91d+56tVKeegm>%ILf&*tpj ztMF5D-PEApI;Zz7ox<4oWVXeA8?B{sAN(I%*qQr&*6?6r*tM>DdeFP3#K>v=i!|0T zBrr1^oALM-14E(A`z_b}88)zfP|uo|?h?qt;BooOJU8P*7-ZbZ>KLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO56)-X|e7nZL z$iTqBa9P*U#mSX{G{Bl%P*lRez;J+pfx##xwK$o9f#C}S14DXwNkIt%17i#W1A|CX zc0maP17iUL1A|C*NRTrF17iyV0~1e4YDEbH0|SF|enDkXW_m`6f}y3QrGjHhep0GJ zaAk2xYHqQDXI^rCQ9*uDVo7QW0|Nup4h9AW240u^5(W3f%sd4n162kpgNVo|1qcff zJ_s=cNG>fZg9jx8g8+j9g8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCG zm^qSpA@ds+OO_6nTdaDlt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JW@PU zd4+f<@d@)yL(o<5icqT158+-B6_LH7;i6x}CW#w~Uy-Pgl#@Irl`kzV zeL|*8R$ca%T%Wv){2zs_iiJvgN^h0dsuZZ2sQy$tsNSU!s;Q*;LF<6_B%M@UD?LHI zSNcZ`78uqV#TeU~$eS{ozBIdFzSClfs*^S+dw;4dus<{M;#|MXC)T}S9v!D zcV!QCPhBq)ZyO(X-(bH4|NMaZz==UigLj2o41F2S6d@OB6%`R(5i>J(Puzn9wnW{e zu;hl6HK{k#IWjCVGqdJqU(99Cv(K+6*i`tgSi2;vbXD1#3jNBGs$DgVwO(~o>mN4i zHPtkqZIx>)Y(Ls5-Br|mx>vQYvH$Kwn@O`L|D75??eGkZnfg$5<;Xeg_o%+-I&+-3%01W^SH2RkDT>t<8AY({UO#lFTB>(_`g8%^e z{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ+Qb|NXRCwBASoP`3KNwv8o*~o!#E+}L zul~OJ`_PwYV}}0>g=_bI-1~9!hs?bH3=IDn7?^X;&b=Qw|3AZj28RC({}~kBEVlk< e_|Nd40Wbh+Uo2;I+U)xP0000 +
  • Re-introduced "blau" (dark) skin.
  • Import/export dialog now offers "Check/uncheck all items" button.
    • diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 72fdcc556..c6d45e188 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -215,52 +215,6 @@ void FormMain::display() { Application::alert(this); } -void FormMain::onCommitData(QSessionManager &manager) { - qDebug("OS asked application to commit its data."); - - manager.setRestartHint(QSessionManager::RestartNever); - manager.release(); -} - -void FormMain::onSaveState(QSessionManager &manager) { - qDebug("OS asked application to save its state."); - - manager.setRestartHint(QSessionManager::RestartNever); - manager.release(); -} - -void FormMain::onAboutToQuit() { - // Make sure that we obtain close lock - // BEFORE even trying to quit the application. - bool locked_safely = qApp->closeLock()->tryLock(CLOSE_LOCK_TIMEOUT); - - qApp->processEvents(); - - qDebug("Cleaning up resources and saving application state."); - m_ui->m_tabWidget->feedMessageViewer()->quit(); - - if (qApp->settings()->value(APP_CFG_MESSAGES, "clear_read_on_exit", false).toBool()) { - m_ui->m_tabWidget->feedMessageViewer()->feedsView()->clearAllReadMessages(); - } - - qApp->database()->saveDatabase(); - saveSize(); - - if (locked_safely) { - // Application obtained permission to close - // in a safety way. - qDebug("Close lock was obtained safely."); - - // We locked the lock to exit peacefully, unlock it to avoid warnings. - qApp->closeLock()->unlock(); - } - else { - // Request for write lock timed-out. This means - // that some critical action can be processed right now. - qDebug("Close lock timed-out."); - } -} - void FormMain::setupIcons() { IconFactory *icon_theme_factory = qApp->icons(); @@ -375,10 +329,6 @@ void FormMain::createConnections() { connect(m_statusBar->fullscreenSwitcher(), SIGNAL(toggled(bool)), m_ui->m_actionFullscreen, SLOT(setChecked(bool))); connect(m_ui->m_actionFullscreen, SIGNAL(toggled(bool)), m_statusBar->fullscreenSwitcher(), SLOT(setChecked(bool))); - // Core connections. - connect(qApp, SIGNAL(commitDataRequest(QSessionManager&)), this, SLOT(onCommitData(QSessionManager&))); - connect(qApp, SIGNAL(saveStateRequest(QSessionManager&)), this, SLOT(onSaveState(QSessionManager&))); - // Menu "File" connections. connect(m_ui->m_actionExportFeeds, SIGNAL(triggered()), this, SLOT(exportFeeds())); connect(m_ui->m_actionImportFeeds, SIGNAL(triggered()), this, SLOT(importFeeds())); @@ -398,9 +348,6 @@ void FormMain::createConnections() { connect(m_ui->m_actionReportBugGitHub, SIGNAL(triggered()), this, SLOT(reportABugOnGitHub())); connect(m_ui->m_actionReportBugBitBucket, SIGNAL(triggered()), this, SLOT(reportABugOnBitBucket())); - // General connections. - connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(onAboutToQuit())); - // Menu "Web browser" connections. connect(m_ui->m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(loadWebBrowserMenu(int))); diff --git a/src/gui/formmain.h b/src/gui/formmain.h index b4ee7f9a1..23ddd33c0 100755 --- a/src/gui/formmain.h +++ b/src/gui/formmain.h @@ -60,6 +60,10 @@ class FormMain : public QMainWindow { // for given actions. QList allActions(); + // Loads/saves visual state of the application. + void loadSize(); + void saveSize(); + protected: // Creates all needed menus and sets them up. void prepareMenus(); @@ -73,10 +77,6 @@ class FormMain : public QMainWindow { // Sets up proper icons for this widget. void setupIcons(); - // Loads/saves visual state of the application. - void loadSize(); - void saveSize(); - public slots: // Processes incoming message from another RSS Guard instance. void processExecutionMessage(const QString &message); @@ -97,13 +97,6 @@ class FormMain : public QMainWindow { void switchMainMenu(); protected slots: - // Last-minute reactors. - void onCommitData(QSessionManager &manager); - void onSaveState(QSessionManager &manager); - - // Used for last-minute actions. - void onAboutToQuit(); - // Loads web browser menu if user selects to change tabs. void loadWebBrowserMenu(int index); diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp index 4bf4f4fba..acb2c07fb 100755 --- a/src/miscellaneous/application.cpp +++ b/src/miscellaneous/application.cpp @@ -23,6 +23,7 @@ #include "gui/messagebox.h" #include "gui/formmain.h" +#include #include @@ -31,6 +32,9 @@ Application::Application(const QString &id, int &argc, char **argv) m_closeLock(NULL), m_userActions(QList()), m_mainForm(NULL), m_trayIcon(NULL), m_settings(NULL), m_system(NULL), m_skins(NULL), m_localization(NULL), m_icons(NULL), m_database(NULL) { + connect(this, SIGNAL(aboutToQuit()), this, SLOT(onAboutToQuit())); + connect(this, SIGNAL(commitDataRequest(QSessionManager&)), this, SLOT(onCommitData(QSessionManager&))); + connect(this, SIGNAL(saveStateRequest(QSessionManager&)), this, SLOT(onSaveState(QSessionManager&))); } Application::~Application() { @@ -87,8 +91,7 @@ void Application::showGuiMessage(const QString& title, const QString& message, QSystemTrayIcon::MessageIcon message_type, QWidget *parent, int duration) { if (SystemTrayIcon::isSystemTrayActivated()) { - // TODO: Maybe show OSD instead if tray icon bubble, - // depending on settings. + // TODO: Maybe show OSD instead if tray icon bubble, depending on settings. trayIcon()->showMessage(title, message, message_type, duration); } else { @@ -96,3 +99,49 @@ void Application::showGuiMessage(const QString& title, const QString& message, MessageBox::show(parent, (QMessageBox::Icon) message_type, title, message); } } + +void Application::onCommitData(QSessionManager &manager) { + qDebug("OS asked application to commit its data."); + + manager.setRestartHint(QSessionManager::RestartNever); + manager.release(); +} + +void Application::onSaveState(QSessionManager &manager) { + qDebug("OS asked application to save its state."); + + manager.setRestartHint(QSessionManager::RestartNever); + manager.release(); +} + +void Application::onAboutToQuit() { + // Make sure that we obtain close lock + // BEFORE even trying to quit the application. + bool locked_safely = closeLock()->tryLock(CLOSE_LOCK_TIMEOUT); + + processEvents(); + + qDebug("Cleaning up resources and saving application state."); + mainForm()->tabWidget()->feedMessageViewer()->quit(); + + if (settings()->value(APP_CFG_MESSAGES, "clear_read_on_exit", false).toBool()) { + mainForm()->tabWidget()->feedMessageViewer()->feedsView()->clearAllReadMessages(); + } + + database()->saveDatabase(); + mainForm()->saveSize(); + + if (locked_safely) { + // Application obtained permission to close + // in a safety way. + qDebug("Close lock was obtained safely."); + + // We locked the lock to exit peacefully, unlock it to avoid warnings. + closeLock()->unlock(); + } + else { + // Request for write lock timed-out. This means + // that some critical action can be processed right now. + qDebug("Close lock timed-out."); + } +} diff --git a/src/miscellaneous/application.h b/src/miscellaneous/application.h index aac70f744..400a9dccc 100755 --- a/src/miscellaneous/application.h +++ b/src/miscellaneous/application.h @@ -125,8 +125,7 @@ class Application : public QtSingleApplication { #else QString temp_directory = QDesktopServices::storageLocation(QDesktopServices::TempLocation); #endif - - return temp_directory; + return temp_directory; } // Access to application tray icon. Always use this in cooperation with @@ -146,6 +145,12 @@ class Application : public QtSingleApplication { return static_cast(QCoreApplication::instance()); } + private slots: + // Last-minute reactors. + void onCommitData(QSessionManager &manager); + void onSaveState(QSessionManager &manager); + void onAboutToQuit(); + private: // This read-write lock is used by application on its close. // Application locks this lock for WRITING.