summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--muse/awl/tcanvas.cpp1
-rw-r--r--muse/muse/CMakeLists.txt2
-rw-r--r--muse/muse/conf.cpp40
-rw-r--r--muse/muse/gconfig.cpp18
-rw-r--r--muse/muse/gconfig.h1
-rw-r--r--muse/muse/preferences.cpp73
-rw-r--r--muse/muse/preferences.ui428
7 files changed, 288 insertions, 275 deletions
diff --git a/muse/awl/tcanvas.cpp b/muse/awl/tcanvas.cpp
index 8027cccc..ef515f50 100644
--- a/muse/awl/tcanvas.cpp
+++ b/muse/awl/tcanvas.cpp
@@ -935,7 +935,6 @@ void TimeCanvas::canvasPaintEvent(const QRect& r, QPainter& p)
void TimeCanvas::paintCanvas(QPainter& p, const QRect& cr)
{
- return;
QPoint off(rCanvasA.topLeft());
if (type == TIME_CANVAS_PIANOROLL) {
diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index f40eb74f..a0b5f7d3 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -126,6 +126,8 @@ add_executable ( muse
midiedit/drummap.cpp
midiedit/citem.cpp
+ midiedit/midicmd.h
+ midiedit/midicmd.cpp
${muse_mocCPP}
${muse_moc_headers}
diff --git a/muse/muse/conf.cpp b/muse/muse/conf.cpp
index 1265acc1..e250622b 100644
--- a/muse/muse/conf.cpp
+++ b/muse/muse/conf.cpp
@@ -78,39 +78,37 @@ void readConfiguration(QDomNode node)
else if (tag == "font5")
config.fonts[5]->fromString(s);
else if (tag == "palette0")
- config.palette[0] = readColor(node);
+ QColorDialog::setCustomColor(0, readColor(node).rgb());
else if (tag == "palette1")
- config.palette[1] = readColor(node);
+ QColorDialog::setCustomColor(1, readColor(node).rgb());
else if (tag == "palette2")
- config.palette[2] = readColor(node);
+ QColorDialog::setCustomColor(2, readColor(node).rgb());
else if (tag == "palette3")
- config.palette[3] = readColor(node);
+ QColorDialog::setCustomColor(3, readColor(node).rgb());
else if (tag == "palette4")
- config.palette[4] = readColor(node);
+ QColorDialog::setCustomColor(4, readColor(node).rgb());
else if (tag == "palette5")
- config.palette[5] = readColor(node);
+ QColorDialog::setCustomColor(5, readColor(node).rgb());
else if (tag == "palette6")
- config.palette[6] = readColor(node);
+ QColorDialog::setCustomColor(6, readColor(node).rgb());
else if (tag == "palette7")
- config.palette[7] = readColor(node);
+ QColorDialog::setCustomColor(7, readColor(node).rgb());
else if (tag == "palette8")
- config.palette[8] = readColor(node);
+ QColorDialog::setCustomColor(8, readColor(node).rgb());
else if (tag == "palette9")
- config.palette[9] = readColor(node);
+ QColorDialog::setCustomColor(9, readColor(node).rgb());
else if (tag == "palette10")
- config.palette[10] = readColor(node);
+ QColorDialog::setCustomColor(10, readColor(node).rgb());
else if (tag == "palette11")
- config.palette[11] = readColor(node);
+ QColorDialog::setCustomColor(11, readColor(node).rgb());
else if (tag == "palette12")
- config.palette[12] = readColor(node);
+ QColorDialog::setCustomColor(12, readColor(node).rgb());
else if (tag == "palette13")
- config.palette[13] = readColor(node);
+ QColorDialog::setCustomColor(13, readColor(node).rgb());
else if (tag == "palette14")
- config.palette[14] = readColor(node);
+ QColorDialog::setCustomColor(14, readColor(node).rgb());
else if (tag == "palette15")
- config.palette[15] = readColor(node);
- else if (tag == "palette16")
- config.palette[16] = readColor(node);
+ QColorDialog::setCustomColor(15, readColor(node).rgb());
else if (tag == "selectPartBg")
config.selectPartBg = readColor(node);
else if (tag == "outputTrackBg")
@@ -405,10 +403,10 @@ void MusE::writeGlobalConfiguration(Xml& xml) const
sprintf(buffer, "font%d", i);
xml.strTag(buffer, config.fonts[i]->toString());
}
- for (int i = 0; i < 16; ++i) {
+ for (int i = 0; i < QColorDialog::customCount(); ++i) {
char buffer[32];
- sprintf(buffer, "palette%d", i);
- xml.colorTag(buffer, config.palette[i]);
+ snprintf(buffer, 32, "palette%d", i);
+ xml.colorTag(buffer, QColorDialog::customColor(i));
}
xml.colorTag("selectPartBg", config.selectPartBg);
diff --git a/muse/muse/gconfig.cpp b/muse/muse/gconfig.cpp
index 7a90489c..414e3348 100644
--- a/muse/muse/gconfig.cpp
+++ b/muse/muse/gconfig.cpp
@@ -22,24 +22,6 @@
GlobalConfigValues config = {
{
- QColor(0xff, 0xff, 0xff), // palette
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- QColor(0xff, 0xff, 0xff),
- },
- {
QColor(255, 232, 140), // part colors
QColor(0xff, 0x00, 0x00),
QColor(0x00, 0xff, 0x00),
diff --git a/muse/muse/gconfig.h b/muse/muse/gconfig.h
index d35ba0f9..137fbcf0 100644
--- a/muse/muse/gconfig.h
+++ b/muse/muse/gconfig.h
@@ -60,7 +60,6 @@ struct MixerConfig {
//---------------------------------------------------------
struct GlobalConfigValues {
- QColor palette[16];
QColor partColors[NUM_PARTCOLORS];
QColor selectPartBg;
QColor transportHandleColor;
diff --git a/muse/muse/preferences.cpp b/muse/muse/preferences.cpp
index c509d609..979ef2b1 100644
--- a/muse/muse/preferences.cpp
+++ b/muse/muse/preferences.cpp
@@ -383,6 +383,18 @@ PreferencesDialog::PreferencesDialog(Arranger* a, QWidget* parent)
}
//---------------------------------------------------------
+// setButtonColor
+//---------------------------------------------------------
+
+static void setButtonColor(QAbstractButton* b, const QRgb c)
+ {
+ QPalette p(b->palette());
+ p.setColor(QPalette::Button, QColor(c));
+ p.setColor(b->backgroundRole(), QColor(c));
+ b->setPalette(p);
+ }
+
+//---------------------------------------------------------
// resetValues
//---------------------------------------------------------
@@ -390,39 +402,22 @@ void PreferencesDialog::resetValues()
{
*config = ::config; // init with global config values
updateFonts();
- QPalette p(palette0->palette());
- p.setColor(QPalette::Button, config->palette[0]);
- palette0->setPalette(p);
- p.setColor(QPalette::Button, config->palette[1]);
- palette1->setPalette(p);
- p.setColor(QPalette::Button, config->palette[2]);
- palette2->setPalette(p);
- p.setColor(QPalette::Button, config->palette[3]);
- palette3->setPalette(p);
- p.setColor(QPalette::Button, config->palette[4]);
- palette4->setPalette(p);
- p.setColor(QPalette::Button, config->palette[5]);
- palette5->setPalette(p);
- p.setColor(QPalette::Button, config->palette[6]);
- palette6->setPalette(p);
- p.setColor(QPalette::Button, config->palette[7]);
- palette7->setPalette(p);
- p.setColor(QPalette::Button, config->palette[8]);
- palette8->setPalette(p);
- p.setColor(QPalette::Button, config->palette[9]);
- palette9->setPalette(p);
- p.setColor(QPalette::Button, config->palette[10]);
- palette10->setPalette(p);
- p.setColor(QPalette::Button, config->palette[11]);
- palette11->setPalette(p);
- p.setColor(QPalette::Button, config->palette[12]);
- palette12->setPalette(p);
- p.setColor(QPalette::Button, config->palette[13]);
- palette13->setPalette(p);
- p.setColor(QPalette::Button, config->palette[14]);
- palette14->setPalette(p);
- p.setColor(QPalette::Button, config->palette[15]);
- palette15->setPalette(p);
+
+ setButtonColor(palette0, QColorDialog::customColor(0));
+ setButtonColor(palette1, QColorDialog::customColor(1));
+ setButtonColor(palette2, QColorDialog::customColor(2));
+ setButtonColor(palette3, QColorDialog::customColor(3));
+ setButtonColor(palette4, QColorDialog::customColor(4));
+ setButtonColor(palette5, QColorDialog::customColor(5));
+ setButtonColor(palette6, QColorDialog::customColor(6));
+ setButtonColor(palette7, QColorDialog::customColor(7));
+ setButtonColor(palette8, QColorDialog::customColor(8));
+ setButtonColor(palette9, QColorDialog::customColor(9));
+ setButtonColor(palette10, QColorDialog::customColor(10));
+ setButtonColor(palette11, QColorDialog::customColor(11));
+ setButtonColor(palette12, QColorDialog::customColor(12));
+ setButtonColor(palette13, QColorDialog::customColor(13));
+ setButtonColor(palette14, QColorDialog::customColor(14));
}
//---------------------------------------------------------
@@ -836,14 +831,8 @@ void PreferencesDialog::addToPaletteClicked()
}
if (button) {
int id = colorGroup->checkedId();
- config->palette[id] = *color;
- QPalette p(button->palette());
- // p.setColor(QPalette::Active, QPalette::Button, *color);
- p.setColor(QPalette::Button, *color);
- p.setColor(button->backgroundRole(), *color);
-
- p.setColor(QPalette::Inactive, QPalette::Button, *color);
- button->setPalette(p);
+ QColorDialog::setCustomColor(id, color->rgb());
+ setButtonColor(button, color->rgb());
}
}
@@ -853,6 +842,8 @@ void PreferencesDialog::addToPaletteClicked()
void PreferencesDialog::paletteClicked(QAbstractButton* button)
{
+ if (color == 0)
+ return;
QColor c = button->palette().color(QPalette::Button);
int r, g, b;
c.getRgb(&r, &g, &b);
diff --git a/muse/muse/preferences.ui b/muse/muse/preferences.ui
index 116fb3e7..a31d9afb 100644
--- a/muse/muse/preferences.ui
+++ b/muse/muse/preferences.ui
@@ -1,7 +1,4 @@
<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
<class>PreferencesDialogBase</class>
<widget class="QDialog" name="PreferencesDialogBase" >
<property name="geometry" >
@@ -9,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>731</width>
- <height>713</height>
+ <height>590</height>
</rect>
</property>
<property name="windowTitle" >
@@ -24,6 +21,9 @@
</property>
<item>
<widget class="QTabWidget" name="tabWidget" >
+ <property name="currentIndex" >
+ <number>1</number>
+ </property>
<widget class="QWidget" name="tab" >
<attribute name="title" >
<string>Application</string>
@@ -79,6 +79,19 @@
<item>
<widget class="QLineEdit" name="startProjectEntry" />
</item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
<item>
@@ -406,29 +419,67 @@
</property>
<item>
<widget class="QTabWidget" name="tabWidget2" >
+ <property name="currentIndex" >
+ <number>0</number>
+ </property>
<widget class="QWidget" name="tab_61" >
<attribute name="title" >
<string>Arranger</string>
</attribute>
- <layout class="QGridLayout" >
+ <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
- <item row="2" column="0" colspan="2" >
- <widget class="QCheckBox" name="arrGrid" >
- <property name="text" >
- <string>show snap grid</string>
+ <item>
+ <widget class="QGroupBox" name="ButtonGroup3" >
+ <property name="title" >
+ <string>Parts</string>
+ </property>
+ <property name="flat" >
+ <bool>true</bool>
</property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>11</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="partShownames" >
+ <property name="text" >
+ <string>show names</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="partShowevents" >
+ <property name="text" >
+ <string>show events</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="partShowCakes" >
+ <property name="text" >
+ <string>show Cakewalk Style</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="1" >
+ <item>
<widget class="QGroupBox" name="eventButtonGroup" >
<property name="title" >
<string>Events</string>
</property>
+ <property name="flat" >
+ <bool>true</bool>
+ </property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
@@ -488,11 +539,14 @@
</layout>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
+ <item>
<widget class="QGroupBox" name="useCanvasBgPixmap" >
<property name="title" >
<string>Background</string>
</property>
+ <property name="flat" >
+ <bool>true</bool>
+ </property>
<property name="checkable" >
<bool>false</bool>
</property>
@@ -503,34 +557,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="1" column="2" >
- <widget class="QToolButton" name="selectCanvasBgColor" >
- <property name="text" >
- <string>select...</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QToolButton" name="selectCanvasBgPixmap" >
- <property name="text" >
- <string>select...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QRadioButton" name="useColor" >
- <property name="text" >
- <string>Color</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QRadioButton" name="usePixmap" >
- <property name="text" >
- <string>Pixmap</string>
- </property>
- </widget>
- </item>
<item row="0" column="1" >
<widget class="QLabel" name="currentBgLabel" >
<property name="sizePolicy" >
@@ -552,6 +578,13 @@
</property>
</widget>
</item>
+ <item row="0" column="0" >
+ <widget class="QRadioButton" name="usePixmap" >
+ <property name="text" >
+ <string>Pixmap</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="1" >
<widget class="QLabel" name="canvasBackgroundColor" >
<property name="text" >
@@ -562,45 +595,50 @@
</property>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="ButtonGroup3" >
- <property name="title" >
- <string>Parts</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="partShownames" >
+ <item row="1" column="0" >
+ <widget class="QRadioButton" name="useColor" >
<property name="text" >
- <string>show names</string>
+ <string>Color</string>
</property>
</widget>
</item>
- <item>
- <widget class="QRadioButton" name="partShowevents" >
+ <item row="1" column="2" >
+ <widget class="QToolButton" name="selectCanvasBgColor" >
<property name="text" >
- <string>show events</string>
+ <string>select...</string>
</property>
</widget>
</item>
- <item>
- <widget class="QRadioButton" name="partShowCakes" >
+ <item row="0" column="2" >
+ <widget class="QToolButton" name="selectCanvasBgPixmap" >
<property name="text" >
- <string>show Cakewalk Style</string>
+ <string>select...</string>
</property>
</widget>
</item>
+ <item row="2" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
+ <item>
+ <widget class="QCheckBox" name="arrGrid" >
+ <property name="text" >
+ <string>show snap grid</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab_6" >
@@ -1432,91 +1470,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="3" column="1" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel5_2" >
- <property name="text" >
- <string>S</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="sslider" >
- <property name="maximum" >
- <number>255</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="1" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel4_2" >
- <property name="text" >
- <string>H</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="hslider" >
- <property name="maximum" >
- <number>255</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item rowspan="2" row="0" column="2" >
- <widget class="QFrame" name="colorframe" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="addToPalette" >
- <property name="text" >
- <string>add to palette</string>
- </property>
- </widget>
- </item>
<item row="0" column="1" >
<widget class="QGroupBox" name="colorPalette" >
<property name="focusPolicy" >
@@ -1532,8 +1485,21 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="3" column="3" >
- <widget class="QToolButton" name="palette15" >
+ <item row="4" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QToolButton" name="palette0" >
<property name="text" >
<string/>
</property>
@@ -1542,8 +1508,8 @@
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QToolButton" name="palette14" >
+ <item row="0" column="1" >
+ <widget class="QToolButton" name="palette1" >
<property name="text" >
<string/>
</property>
@@ -1552,8 +1518,8 @@
</property>
</widget>
</item>
- <item row="2" column="3" >
- <widget class="QToolButton" name="palette11" >
+ <item row="0" column="2" >
+ <widget class="QToolButton" name="palette2" >
<property name="text" >
<string/>
</property>
@@ -1562,8 +1528,8 @@
</property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QToolButton" name="palette10" >
+ <item row="0" column="3" >
+ <widget class="QToolButton" name="palette3" >
<property name="text" >
<string/>
</property>
@@ -1572,8 +1538,8 @@
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="QToolButton" name="palette7" >
+ <item row="1" column="0" >
+ <widget class="QToolButton" name="palette4" >
<property name="text" >
<string/>
</property>
@@ -1582,8 +1548,8 @@
</property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QToolButton" name="palette6" >
+ <item row="2" column="0" >
+ <widget class="QToolButton" name="palette8" >
<property name="text" >
<string/>
</property>
@@ -1592,8 +1558,8 @@
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QToolButton" name="palette13" >
+ <item row="3" column="0" >
+ <widget class="QToolButton" name="palette12" >
<property name="text" >
<string/>
</property>
@@ -1602,8 +1568,8 @@
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QToolButton" name="palette9" >
+ <item row="1" column="1" >
+ <widget class="QToolButton" name="palette5" >
<property name="text" >
<string/>
</property>
@@ -1612,8 +1578,8 @@
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QToolButton" name="palette5" >
+ <item row="2" column="1" >
+ <widget class="QToolButton" name="palette9" >
<property name="text" >
<string/>
</property>
@@ -1622,8 +1588,8 @@
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QToolButton" name="palette12" >
+ <item row="3" column="1" >
+ <widget class="QToolButton" name="palette13" >
<property name="text" >
<string/>
</property>
@@ -1632,8 +1598,8 @@
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QToolButton" name="palette8" >
+ <item row="1" column="2" >
+ <widget class="QToolButton" name="palette6" >
<property name="text" >
<string/>
</property>
@@ -1642,8 +1608,8 @@
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QToolButton" name="palette4" >
+ <item row="1" column="3" >
+ <widget class="QToolButton" name="palette7" >
<property name="text" >
<string/>
</property>
@@ -1652,8 +1618,8 @@
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QToolButton" name="palette3" >
+ <item row="2" column="2" >
+ <widget class="QToolButton" name="palette10" >
<property name="text" >
<string/>
</property>
@@ -1662,8 +1628,8 @@
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QToolButton" name="palette2" >
+ <item row="2" column="3" >
+ <widget class="QToolButton" name="palette11" >
<property name="text" >
<string/>
</property>
@@ -1672,8 +1638,8 @@
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QToolButton" name="palette1" >
+ <item row="3" column="2" >
+ <widget class="QToolButton" name="palette14" >
<property name="text" >
<string/>
</property>
@@ -1682,8 +1648,8 @@
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QToolButton" name="palette0" >
+ <item row="3" column="3" >
+ <widget class="QToolButton" name="palette15" >
<property name="text" >
<string/>
</property>
@@ -1695,6 +1661,36 @@
</layout>
</widget>
</item>
+ <item row="4" column="1" colspan="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel6_2" >
+ <property name="text" >
+ <string>V</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="vslider" >
+ <property name="maximum" >
+ <number>255</number>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
<item rowspan="5" row="0" column="0" >
<widget class="QTreeWidget" name="itemList" >
<property name="sizePolicy" >
@@ -1715,7 +1711,32 @@
</column>
</widget>
</item>
- <item row="4" column="1" colspan="2" >
+ <item row="1" column="1" >
+ <widget class="QPushButton" name="addToPalette" >
+ <property name="text" >
+ <string>add to palette</string>
+ </property>
+ </widget>
+ </item>
+ <item rowspan="2" row="0" column="2" >
+ <widget class="QFrame" name="colorframe" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Sunken</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@@ -1724,9 +1745,9 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="textLabel6_2" >
+ <widget class="QLabel" name="textLabel4_2" >
<property name="text" >
- <string>V</string>
+ <string>H</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -1734,7 +1755,37 @@
</widget>
</item>
<item>
- <widget class="QSlider" name="vslider" >
+ <widget class="QSlider" name="hslider" >
+ <property name="maximum" >
+ <number>255</number>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="1" colspan="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel5_2" >
+ <property name="text" >
+ <string>S</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="sslider" >
<property name="maximum" >
<number>255</number>
</property>
@@ -2314,35 +2365,26 @@
</item>
</layout>
</widget>
- <pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>QuantCombo</class>
<extends>QComboBox</extends>
<header>quantcombo.h</header>
- <container>0</container>
- <pixmap></pixmap>
</customwidget>
<customwidget>
<class>RecordButton</class>
<extends>QToolButton</extends>
<header>recordbutton.h</header>
- <container>0</container>
- <pixmap></pixmap>
</customwidget>
<customwidget>
<class>GreendotButton</class>
<extends>QToolButton</extends>
<header>greendotbutton.h</header>
- <container>0</container>
- <pixmap></pixmap>
</customwidget>
<customwidget>
<class>RasterCombo</class>
<extends>QComboBox</extends>
<header>rastercombo.h</header>
- <container>0</container>
- <pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 20:13:30 +0000