FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable that tiny shit.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-02 21:42:45 +01:00
parent 786eb10d58
commit be167db45b
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/feedmessageviewer.cpp
View File

@ -101,8 +101,6 @@ void FeedMessageViewer::updateTrayIconStatus(int unread_messages,
int total_messages) { int total_messages) {
Q_UNUSED(total_messages) Q_UNUSED(total_messages)
// TODO: Optimize the call isSystemTrayActivated()
// because it opens settings (use member variable)?.
if (SystemTrayIcon::isSystemTrayActivated()) { if (SystemTrayIcon::isSystemTrayActivated()) {
SystemTrayIcon::instance()->setNumber(unread_messages); SystemTrayIcon::instance()->setNumber(unread_messages);
} }

23
src/gui/formstandardfeeddetails.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>375</width> <width>375</width>
<height>360</height> <height>373</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,9 +16,6 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="m_lblParentCategory"> <widget class="QLabel" name="m_lblParentCategory">
<property name="text"> <property name="text">
@ -101,6 +98,20 @@
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QCheckBox" name="m_checkAutoUpdate">
<property name="text">
<string>Update each</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QSpinBox" name="m_spinAutoUpdate">
<property name="suffix">
<string> minutes</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="m_lblIcon"> <widget class="QLabel" name="m_lblIcon">
<property name="text"> <property name="text">
<string>Icon</string> <string>Icon</string>
@ -110,7 +121,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1">
<widget class="QToolButton" name="m_btnIcon"> <widget class="QToolButton" name="m_btnIcon">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -147,7 +158,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="8" column="0" colspan="2">
<widget class="QGroupBox" name="m_gbAuthentication"> <widget class="QGroupBox" name="m_gbAuthentication">
<property name="toolTip"> <property name="toolTip">
<string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string> <string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string>

9
src/gui/systemtrayicon.cpp
View File

@ -141,7 +141,7 @@ void SystemTrayIcon::setNumber(int number) {
// Numbers with more than 2 digits won't be readable, display // Numbers with more than 2 digits won't be readable, display
// infinity symbol in that case. // infinity symbol in that case.
if (number > 99) { if (number > 999) {
m_font.setPixelSize(100); m_font.setPixelSize(100);
tray_painter.setFont(m_font); tray_painter.setFont(m_font);
@ -150,8 +150,11 @@ void SystemTrayIcon::setNumber(int number) {
QChar(8734)); QChar(8734));
} }
else { else {
// Smaller number if it has 2 digits. // Smaller number if it has 3 digits.
if (number > 9) { if (number > 99) {
m_font.setPixelSize(55);
}
else if (number > 9) {
m_font.setPixelSize(80); m_font.setPixelSize(80);
} }
// Bigger number if it has just one digit. // Bigger number if it has just one digit.