[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp... |
Date: |
Thu, 24 Jan 2008 18:06:26 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/24 18:06:26
Modified files:
src/traverso/dialogs/settings: Pages.cpp Pages.h
src/traverso : SpectralMeterWidget.cpp
src/traverso/ui: BehaviorConfigPage.ui ThemeConfigPage.ui
Log message:
* some minor improvements
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/BehaviorConfigPage.ui?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ThemeConfigPage.ui?cvsroot=traverso&r1=1.5&r2=1.6
Patches:
Index: dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- dialogs/settings/Pages.cpp 23 Jan 2008 21:16:45 -0000 1.37
+++ dialogs/settings/Pages.cpp 24 Jan 2008 18:06:26 -0000 1.38
@@ -549,9 +549,7 @@
void AppearancePage::save_config()
{
- QString path = m_themepage->themePathLineEdit->text();
-
- config().set_property("Themer", "themepath", path);
+ config().set_property("Themer", "themepath",
m_themepage->themePathLineEdit->text());
config().set_property("Themer", "currenttheme",
m_themepage->themeSelecterCombo->currentText());
config().set_property("Themer", "coloradjust",
m_themepage->colorAdjustBox->value());
config().set_property("Themer", "style",
m_themepage->styleCombo->currentText());
@@ -566,7 +564,7 @@
QIcon icon =
QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon);
m_themepage->pathSelectButton->setIcon(icon);
QString themepath = config().get_property("Themer", "themepath",
-
QString(getenv("HOME")).append(".traverso/themes")).toString();
+
QString(QDir::homePath()).append(".traverso/themes")).toString();
QStringList keys = QStyleFactory::keys();
@@ -608,7 +606,7 @@
{
m_themepage->styleCombo->clear();
- config().set_property("Themer", "themepath",
QString(getenv("HOME")).append("/.traverso/themes"));
+ config().set_property("Themer", "themepath",
QString(QDir::homePath()).append("/.traverso/themes"));
config().set_property("Themer", "currenttheme", "TraversoLight");
config().set_property("Themer", "coloradjust", 100);
QString systemstyle =
QString(QApplication::style()->metaObject()->className()).remove("Q").remove("Style");
@@ -633,6 +631,7 @@
connect(styleCombo, SIGNAL(currentIndexChanged(const QString)), this,
SLOT(style_index_changed(const QString)));
connect(themeSelecterCombo, SIGNAL(currentIndexChanged(const QString)),
this, SLOT(theme_index_changed(const QString)));
connect(useStylePalletCheckBox, SIGNAL(toggled(bool)), this,
SLOT(use_selected_styles_pallet_checkbox_toggled(bool)));
+ connect(pathSelectButton, SIGNAL(clicked()), this,
SLOT(dirselect_button_clicked()));
connect(colorAdjustBox, SIGNAL(valueChanged(int)), this,
SLOT(color_adjustbox_changed(int)));
connect(rectifiedCheckBox, SIGNAL(toggled(bool)), this,
SLOT(theme_option_changed()));
connect(mergedCheckBox, SIGNAL(toggled(bool)), this,
SLOT(theme_option_changed()));
@@ -674,6 +673,21 @@
themer()->set_color_adjust_value(value);
}
+void ThemeConfigPage::dirselect_button_clicked()
+{
+ QString path = themePathLineEdit->text();
+ if (path.isEmpty()) {
+ path = QDir::homePath();
+ }
+ QString dirName = QFileDialog::getExistingDirectory(this,
+ tr("Select default project dir"), path);
+
+ if (!dirName.isEmpty()) {
+ themePathLineEdit->setText(dirName);
+ update_theme_combobox(dirName);
+ }
+}
+
void ThemeConfigPage::update_theme_combobox(const QString& path)
{
themeSelecterCombo->clear();
Index: dialogs/settings/Pages.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dialogs/settings/Pages.h 23 Jan 2008 21:16:46 -0000 1.9
+++ dialogs/settings/Pages.h 24 Jan 2008 18:06:26 -0000 1.10
@@ -137,6 +137,7 @@
friend class AppearancePage;
private slots:
+ void dirselect_button_clicked();
void style_index_changed(const QString& text);
void theme_index_changed(const QString& theme);
void use_selected_styles_pallet_checkbox_toggled(bool);
Index: SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- SpectralMeterWidget.cpp 21 Jan 2008 16:22:17 -0000 1.49
+++ SpectralMeterWidget.cpp 24 Jan 2008 18:06:26 -0000 1.50
@@ -629,7 +629,7 @@
QPainter painter(&image);
m_widget->render(&painter);
- QString fn = QFileDialog::getSaveFileName (0, tr("Screen Capture file
name"), getenv("HOME"));
+ QString fn = QFileDialog::getSaveFileName (0, tr("Screen Capture file
name"), QDir::homePath());
// if aborted exit here
if (fn.isEmpty()) {
Index: ui/BehaviorConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/BehaviorConfigPage.ui,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ui/BehaviorConfigPage.ui 23 Jan 2008 21:16:46 -0000 1.9
+++ ui/BehaviorConfigPage.ui 24 Jan 2008 18:06:26 -0000 1.10
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>336</width>
- <height>362</height>
+ <height>328</height>
</rect>
</property>
<property name="windowTitle" >
@@ -17,7 +17,7 @@
<number>0</number>
</property>
<property name="spacing" >
- <number>9</number>
+ <number>6</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox" >
@@ -32,7 +32,7 @@
<number>6</number>
</property>
<item>
- <layout class="QVBoxLayout" >
+ <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
@@ -42,22 +42,27 @@
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
- <string>On project close</string>
+ <string>On close:</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>23</height>
+ </size>
</property>
+ </spacer>
+ </item>
<item>
<widget class="QRadioButton" name="saveRadioButton" >
<property name="text" >
- <string>Save Project</string>
+ <string>Save</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -78,21 +83,6 @@
</property>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
</layout>
</item>
<item>
Index: ui/ThemeConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ThemeConfigPage.ui,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ui/ThemeConfigPage.ui 7 Jan 2008 18:17:23 -0000 1.5
+++ ui/ThemeConfigPage.ui 24 Jan 2008 18:06:26 -0000 1.6
@@ -88,7 +88,7 @@
<item>
<widget class="QLineEdit" name="themePathLineEdit" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="sizePolicy" >
<sizepolicy>
@@ -99,13 +99,13 @@
</sizepolicy>
</property>
<property name="mouseTracking" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="acceptDrops" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="readOnly" >
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
- [Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp...,
Remon Sijrier <=