FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2024-12-31 18:37:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed one icon + some tweaking.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-03 08:32:43 +01:00
parent 37a3259166
commit 22909150ac
5 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/graphics/icons/mini-kfaenza/edit-delete.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

28
src/gui/formstandardcategorydetails.cpp
View File

@ -8,10 +8,8 @@
#include "gui/iconthemefactory.h"
#include "gui/feedsview.h"
#include "gui/baselineedit.h"
#if !defined(Q_OS_WIN)
#include "gui/messagebox.h"
#endif
#include "gui/systemtrayicon.h"
#include <QLineEdit>
#include <QTextEdit>
@ -104,7 +102,17 @@ void FormStandardCategoryDetails::apply() {
accept();
}
else {
// TODO: hlasit chybu
if (SystemTrayIcon::isSystemTrayActivated()) {
SystemTrayIcon::instance()->showMessage(tr("Cannot add category"),
tr("Category was not added due to error."),
QSystemTrayIcon::Critical);
}
else {
MessageBox::show(this,
QMessageBox::Critical,
tr("Cannot add category"),
tr("Category was not added due to error."));
}
}
}
else {
@ -112,7 +120,17 @@ void FormStandardCategoryDetails::apply() {
accept();
}
else {
// TODO: hlasit chybu
if (SystemTrayIcon::isSystemTrayActivated()) {
SystemTrayIcon::instance()->showMessage(tr("Cannot edit category"),
tr("Category was not edited due to error."),
QSystemTrayIcon::Critical);
}
else {
MessageBox::show(this,
QMessageBox::Critical,
tr("Cannot edit category"),
tr("Category was not edited due to error."));
}
}
}
}

6
src/gui/formstandardcategorydetails.ui
View File

@ -40,6 +40,12 @@
<property name="toolTip">
<string>Select parent item for your category.</string>
</property>
<property name="iconSize">
<size>
<width>13</width>
<height>12</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">

28
src/gui/formstandardfeeddetails.cpp
View File

@ -9,10 +9,8 @@
#include "core/feedsmodelstandardfeed.h"
#include "gui/iconthemefactory.h"
#include "gui/baselineedit.h"
#if !defined(Q_OS_WIN)
#include "gui/messagebox.h"
#endif
#include "gui/systemtrayicon.h"
#include <QPushButton>
#include <QTextCodec>
@ -192,7 +190,17 @@ void FormStandardFeedDetails::apply() {
accept();
}
else {
// TODO: hlasit chybu
if (SystemTrayIcon::isSystemTrayActivated()) {
SystemTrayIcon::instance()->showMessage(tr("Cannot add feed"),
tr("Feed was not added due to error."),
QSystemTrayIcon::Critical);
}
else {
MessageBox::show(this,
QMessageBox::Critical,
tr("Cannot add feed"),
tr("Feed was not added due to error."));
}
}
}
else {
@ -201,7 +209,17 @@ void FormStandardFeedDetails::apply() {
accept();
}
else {
// TODO: hlasit chybu
if (SystemTrayIcon::isSystemTrayActivated()) {
SystemTrayIcon::instance()->showMessage(tr("Cannot edit feed"),
tr("Feed was not edited due to error."),
QSystemTrayIcon::Critical);
}
else {
MessageBox::show(this,
QMessageBox::Critical,
tr("Cannot edit feed"),
tr("Feed was not edited due to error."));
}
}
}
}

9
src/gui/formstandardfeeddetails.ui
View File

@ -31,6 +31,15 @@
<property name="toolTip">
<string>Select parent item for your feed.</string>
</property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
<property name="frame">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">