Skip to content

Commit

Permalink
Remove "Default" options
Browse files Browse the repository at this point in the history
  • Loading branch information
@mistic100
mistic100 committed Dec 2, 2018
1 parent 41d4f1a commit 9c310e7
Show file tree
Hide file tree
Showing 10 changed files with 220 additions and 492 deletions.
21 changes: 0 additions & 21 deletions src/gui/configdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,6 @@ ConfigDialog::ConfigDialog(QWidget* _parent, Controller* _ctrl) :
ui->optionOpenProgram->setCurrentData("default");
}

// type
ui->optionType->addItem(QIcon(":/images/icons/w_monitor.png"), tr("One image for each monitor"), UM::W_MONITOR);
ui->optionType->addItem(QIcon(":/images/icons/w_desktop.png"), tr("One image for the whole desktop"), UM::W_DESKTOP);
ui->optionType->setCurrentData(m_settings->param(UM::CONF::default_type));

// style
ui->optionStyle->addItem(QIcon(":/images/icons/im_center.png"), tr("Center"), UM::IM_CENTER);
ui->optionStyle->addItem(QIcon(":/images/icons/im_tile.png"), tr("Tile"), UM::IM_TILE);
ui->optionStyle->addItem(QIcon(":/images/icons/im_stretch.png"), tr("Stretch"), UM::IM_STRETCH);
ui->optionStyle->addItem(QIcon(":/images/icons/im_stretch_prop.png"), tr("Fit"), UM::IM_STRETCH_PROP);
ui->optionStyle->addItem(QIcon(":/images/icons/im_fill.png"), tr("Fill"), UM::IM_FILL);
ui->optionStyle->setCurrentData(m_settings->param(UM::CONF::default_style));

// mode
ui->optionMode->addItem(QIcon(":/images/icons/mode_random.png"), tr("Random"), UM::MODE_RANDOM);
ui->optionMode->addItem(QIcon(":/images/icons/mode_sequential.png"), tr("Sequential"), UM::MODE_SEQUENTIAL);
ui->optionMode->setCurrentData(m_settings->param(UM::CONF::default_mode));

// sets
ui->optionDefaultSet->addItem(tr("[do not change]"), "");

Expand Down Expand Up @@ -267,9 +249,6 @@ void ConfigDialog::save()
m_settings->setParam(UM::CONF::delay, delay);
m_settings->setParam(UM::CONF::language, lang);
m_settings->setParam(UM::CONF::open_program, opener);
m_settings->setParam(UM::CONF::default_mode, ui->optionMode->currentData());
m_settings->setParam(UM::CONF::default_type, ui->optionType->currentData());
m_settings->setParam(UM::CONF::default_style, ui->optionStyle->currentData());
m_settings->setParam(UM::CONF::minimize, ui->optionMinimize->isChecked());
m_settings->setParam(UM::CONF::check_updates, ui->optionCheckUpdates->isChecked());
m_settings->setParam(UM::CONF::use_hotkeys, ui->optionUseHotkeys->isChecked());
Expand Down
183 changes: 55 additions & 128 deletions src/gui/configdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>350</width>
<height>258</height>
<height>317</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -37,6 +37,16 @@
<property name="rightMargin">
<number>20</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>File editor :</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
Expand Down Expand Up @@ -67,54 +77,63 @@
<item row="0" column="1" colspan="2">
<widget class="QComboBoxExt" name="optionLang"/>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBoxExt" name="optionOpenProgram"/>
</item>
<item row="3" column="0" colspan="3">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>20</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="optionAutostart">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Start with Windows</string>
<string>Change set on close :</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="optionMinimize">
<property name="text">
<string>Minimize on startup</string>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="optionCheckUpdates">
<property name="text">
<string>Check updates</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="optionShowNotifications">
<property name="text">
<string>Show notifications</string>
</property>
</widget>
<widget class="QComboBoxExt" name="optionDefaultSet"/>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>File editor :</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<item row="6" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Windows integration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="optionAutostart">
<property name="text">
<string>Start with Windows</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="optionMinimize">
<property name="text">
<string>Minimize on startup</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="optionCheckUpdates">
<property name="text">
<string>Check updates</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="optionShowNotifications">
<property name="text">
<string>Show notifications</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBoxExt" name="optionOpenProgram"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="lock">
Expand Down Expand Up @@ -253,98 +272,6 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="defaults">
<attribute name="title">
<string>Defaults</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1,2">
<property name="leftMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<item row="2" column="1" colspan="2">
<widget class="QComboBoxExt" name="optionType"/>
</item>
<item row="1" column="0" colspan="3">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Defaults settings for new sets.</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Change set on close :</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBoxExt" name="optionDefaultSet"/>
</item>
<item row="3" column="1" colspan="2">
<widget class="QComboBoxExt" name="optionStyle">
<property name="iconSize">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QComboBoxExt" name="optionMode"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Type :</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Style :</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Mode :</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="hotkeys">
<attribute name="title">
<string>Hotkeys</string>
Expand Down
8 changes: 8 additions & 0 deletions src/lang/en_GB/changelog.htm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
<dl>
<dt>Version 2.3.2 <small>????</small></dt>
<dd>
<ul>
<li>Add "Change set on close" option</li>
<li>Remove "Default" options</li>
</ul>
</dd>

<dt>Version 2.3.1 <small>February 9th 2018</small></dt>
<dd>
<ul>
Expand Down
Loading

0 comments on commit 9c310e7

Please sign in to comment.