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

cascsa

Browse Source
This commit is contained in:
Martin Rotter 2013-12-09 16:05:16 +01:00
parent 431b668f28
commit 8092177fa8
6 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/dynamicshortcutswidget.cpp
View File

@ -2,9 +2,11 @@
#include <QAction> #include <QAction>
#include <QLabel> #include <QLabel>
#include <QSpacerItem> #include <QSpacerItem>
#include <QPalette>
#include "gui/dynamicshortcutswidget.h" #include "gui/dynamicshortcutswidget.h"
#include "gui/shortcutcatcher.h" #include "gui/shortcutcatcher.h"
#include "gui/shortcutbutton.h"
DynamicShortcutsWidget::DynamicShortcutsWidget(QWidget *parent) : QWidget(parent) { DynamicShortcutsWidget::DynamicShortcutsWidget(QWidget *parent) : QWidget(parent) {
@ -26,8 +28,8 @@ bool DynamicShortcutsWidget::areShortcutsUnique() {
foreach (const ActionBinding &binding, m_actionBindings) { foreach (const ActionBinding &binding, m_actionBindings) {
QKeySequence new_shortcut = binding.second->shortcut(); QKeySequence new_shortcut = binding.second->shortcut();
if (all_shortcuts.contains(new_shortcut)) { if (all_shortcuts.contains(new_shortcut) && !new_shortcut.isEmpty()) {
// Problem, two identical shortcuts found. // Problem, two identical non-empty shortcuts found.
return false; return false;
} }
else { else {

41
src/gui/formsettings.cpp
View File

@ -81,6 +81,8 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
this, SLOT(changeBrowserProgressColor())); this, SLOT(changeBrowserProgressColor()));
connect(m_ui->m_treeSkins, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), connect(m_ui->m_treeSkins, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
this, SLOT(onSkinSelected(QTreeWidgetItem*,QTreeWidgetItem*))); this, SLOT(onSkinSelected(QTreeWidgetItem*,QTreeWidgetItem*)));
connect(m_ui->m_cmbExternalBrowserPreset, SIGNAL(currentIndexChanged(int)),
this, SLOT(changeDefaultBrowserArguments(int)));
// Load all settings. // Load all settings.
loadGeneral(); loadGeneral();
@ -89,12 +91,19 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
loadProxy(); loadProxy();
loadBrowser(); loadBrowser();
loadLanguage(); loadLanguage();
loadFeedsMessages();
} }
FormSettings::~FormSettings() { FormSettings::~FormSettings() {
delete m_ui; delete m_ui;
} }
void FormSettings::changeDefaultBrowserArguments(int index) {
if (index != 0) {
m_ui->m_txtExternalBrowserArguments->setText(m_ui->m_cmbExternalBrowserPreset->itemData(index).toString());
}
}
void FormSettings::onSkinSelected(QTreeWidgetItem *current, void FormSettings::onSkinSelected(QTreeWidgetItem *current,
QTreeWidgetItem *previous) { QTreeWidgetItem *previous) {
Q_UNUSED(previous); Q_UNUSED(previous);
@ -114,6 +123,14 @@ void FormSettings::changeBrowserProgressColor() {
m_initialSettings.m_webBrowserProgress = color_dialog.selectedColor(); m_initialSettings.m_webBrowserProgress = color_dialog.selectedColor();
} }
void FormSettings::loadFeedsMessages() {
m_ui->m_cmbExternalBrowserPreset->addItem("Chromium", "aa %1");
}
void FormSettings::saveFeedsMessages() {
}
void FormSettings::displayProxyPassword(int state) { void FormSettings::displayProxyPassword(int state) {
if (state == Qt::Checked) { if (state == Qt::Checked) {
m_ui->m_txtProxyPassword->setEchoMode(QLineEdit::Normal); m_ui->m_txtProxyPassword->setEchoMode(QLineEdit::Normal);
@ -192,6 +209,7 @@ void FormSettings::saveSettings() {
saveProxy(); saveProxy();
saveBrowser(); saveBrowser();
saveLanguage(); saveLanguage();
saveFeedsMessages();
Settings::getInstance()->checkSettings(); Settings::getInstance()->checkSettings();
promptForRestart(); promptForRestart();
@ -353,17 +371,17 @@ void FormSettings::loadGeneral() {
// Load auto-start status. // Load auto-start status.
SystemFactory::AutoStartStatus autostart_status = SystemFactory::getAutoStartStatus(); SystemFactory::AutoStartStatus autostart_status = SystemFactory::getAutoStartStatus();
switch (autostart_status) { switch (autostart_status) {
case SystemFactory::Enabled: case SystemFactory::Enabled:
m_ui->m_checkAutostart->setChecked(true); m_ui->m_checkAutostart->setChecked(true);
break; break;
case SystemFactory::Disabled: case SystemFactory::Disabled:
m_ui->m_checkAutostart->setChecked(false); m_ui->m_checkAutostart->setChecked(false);
break; break;
default: default:
m_ui->m_checkAutostart->setEnabled(false); m_ui->m_checkAutostart->setEnabled(false);
m_ui->m_checkAutostart->setText(m_ui->m_checkAutostart->text() + m_ui->m_checkAutostart->setText(m_ui->m_checkAutostart->text() +
tr(" (not supported on this platform)")); tr(" (not supported on this platform)"));
break; break;
} }
} }
@ -455,7 +473,6 @@ void FormSettings::loadInterface() {
m_ui->m_treeSkins->addTopLevelItem(new_item); m_ui->m_treeSkins->addTopLevelItem(new_item);
if (skin.m_baseName == selected_skin) { if (skin.m_baseName == selected_skin) {
m_initialSettings.m_skin = selected_skin;
m_ui->m_treeSkins->setCurrentItem(new_item); m_ui->m_treeSkins->setCurrentItem(new_item);
m_ui->m_lblActiveContents->setText(skin.m_visibleName); m_ui->m_lblActiveContents->setText(skin.m_visibleName);
} }

8
src/gui/formsettings.h
View File

@ -15,12 +15,10 @@ struct TemporarySettings {
public: public:
TemporarySettings() TemporarySettings()
: m_webBrowserProgress(QColor()), : m_webBrowserProgress(QColor()) {
m_skin(QString()) {
} }
QColor m_webBrowserProgress; QColor m_webBrowserProgress;
QString m_skin;
}; };
class FormSettings : public QDialog { class FormSettings : public QDialog {
@ -63,6 +61,10 @@ class FormSettings : public QDialog {
void saveProxy(); void saveProxy();
void displayProxyPassword(int state); void displayProxyPassword(int state);
void loadFeedsMessages();
void saveFeedsMessages();
void changeDefaultBrowserArguments(int index);
void onProxyTypeChanged(int index); void onProxyTypeChanged(int index);
private: private:

89
src/gui/formsettings.ui
View File

@ -147,8 +147,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>195</width> <width>167</width>
<height>238</height> <height>219</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -663,59 +663,23 @@
<string>Messages</string> <string>Messages</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout_10"> <layout class="QFormLayout" name="formLayout_10">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
<string>External web browser for message viewing</string> <string>External web browser for message viewing</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_11"> <layout class="QFormLayout" name="formLayout_11">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="m_lblExternalBrowserPreset">
<property name="text">
<string>Preset</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="m_cmbExternalBrowserPreset">
<item>
<property name="text">
<string>custom</string>
</property>
</item>
<item>
<property name="text">
<string>Chromium</string>
</property>
</item>
<item>
<property name="text">
<string>Google Chrome</string>
</property>
</item>
<item>
<property name="text">
<string>Opera</string>
</property>
</item>
<item>
<property name="text">
<string>Mozilla Firefox</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="m_lblExternalBrowserExecutable"> <widget class="QLabel" name="m_lblExternalBrowserExecutable">
<property name="text"> <property name="text">
<string>Web browser executable</string> <string>Web browser executable</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_10"> <layout class="QHBoxLayout" name="horizontalLayout_10">
<item> <item>
<widget class="QLineEdit" name="m_txtExternalBrowserExecutable"/> <widget class="QLineEdit" name="m_txtExternalBrowserExecutable"/>
@ -729,15 +693,48 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="m_lblExternalBrowserArguments"> <widget class="QLabel" name="m_lblExternalBrowserArguments">
<property name="text"> <property name="text">
<string>Executable arguments</string> <string>Executable parameters</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="m_txtExternalBrowserArguments"/> <layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLineEdit" name="m_txtExternalBrowserArguments"/>
</item>
<item>
<widget class="QLabel" name="m_lblExternalBrowserPreset">
<property name="text">
<string>use sample arguments for</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="m_cmbExternalBrowserPreset">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
<item>
<property name="text">
<string>select browser</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

4
src/gui/messagesview.cpp
View File

@ -99,6 +99,10 @@ void MessagesView::selectionChanged(const QItemSelection &selected,
void MessagesView::keyPressEvent(QKeyEvent *event) { void MessagesView::keyPressEvent(QKeyEvent *event) {
QTreeView::keyPressEvent(event); QTreeView::keyPressEvent(event);
if (event->key() == Qt::Key_Delete) {
deleteSelectedMessages();
}
} }
void MessagesView::contextMenuEvent(QContextMenuEvent *event) { void MessagesView::contextMenuEvent(QContextMenuEvent *event) {

2
src/gui/shortcutcatcher.h
View File

@ -38,7 +38,9 @@ class ShortcutButton;
class ShortcutCatcher : public QWidget { class ShortcutCatcher : public QWidget {
Q_OBJECT Q_OBJECT
friend class ShortcutButton; friend class ShortcutButton;
friend class DynamicShortcutsWidget;
public: public:
// Constructors and destructors. // Constructors and destructors.