r16617 by jghali - activates the color/transparency widget in frame properties palette, this one will be replaced later
scribus-commit
scribus-commit at lists.scribus.net
Fri May 13 15:17:17 UTC 2011
Author: jghali
Date: Fri May 13 15:17:16 2011
New Revision: 16617
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16617
Log:
activates the color/transparency widget in frame properties palette, this one will be replaced later
Modified:
branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
branches/ScribusOIF/scribus/ui/propertywidget_colortrans.cpp
branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
branches/ScribusOIF/scribus/ui/propertywidget_colortransbase.ui
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16617&path=/branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp Fri May 13 15:17:16 2011
@@ -60,8 +60,8 @@
lineWidget = new PropertyWidget_Line(widget);
vboxLayout->addWidget(lineWidget);
- //colorTransWidget = new PropertyWidget_ColorTrans(widget);
- //vboxLayout->addWidget(colorTransWidget);
+ colorTransWidget = new PropertyWidget_ColorTrans(widget);
+ vboxLayout->addWidget(colorTransWidget);
setWidget(widget);
@@ -97,7 +97,7 @@
setParent(m_ScMW);
move(p2);
- //this->colorTransWidget->setMainWindow(mw);
+ this->colorTransWidget->setMainWindow(mw);
this->lineWidget->setMainWindow(mw);
this->posWidget->setMainWindow(mw);
this->shapeWidget->setMainWindow(mw);
@@ -117,7 +117,7 @@
m_doc = d;
m_item = NULL;
- //this->colorTransWidget->setDoc(m_doc);
+ this->colorTransWidget->setDoc(m_doc);
this->lineWidget->setDoc(m_doc);
this->posWidget->setDoc(m_doc);
this->shapeWidget->setDoc(m_doc);
@@ -187,7 +187,7 @@
{
setWindowTitle( tr("Frame Properties"));
- //colorTransWidget->languageChange();
+ colorTransWidget->languageChange();
lineWidget->languageChange();
posWidget->languageChange();
shapeWidget->languageChange();
@@ -201,7 +201,7 @@
m_unitRatio = m_doc->unitRatio();
m_unitIndex = m_doc->unitIndex();
- //colorTransWidget->unitChange();
+ colorTransWidget->unitChange();
lineWidget->unitChange();
posWidget->unitChange();
shapeWidget->unitChange();
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16617&path=/branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_frame.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_frame.h Fri May 13 15:17:16 2011
@@ -45,7 +45,7 @@
void setCurrentItem(PageItem *i);
private:
- //PropertyWidget_ColorTrans* colorTransWidget;
+ PropertyWidget_ColorTrans* colorTransWidget;
PropertyWidget_Line* lineWidget;
PropertyWidget_Position* posWidget;
PropertyWidget_Shape* shapeWidget;
Modified: branches/ScribusOIF/scribus/ui/propertywidget_colortrans.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16617&path=/branches/ScribusOIF/scribus/ui/propertywidget_colortrans.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_colortrans.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_colortrans.cpp Fri May 13 15:17:16 2011
@@ -7,7 +7,7 @@
#include "propertywidget_colortrans.h"
-PropertyWidget_ColorTrans::PropertyWidget_ColorTrans(QWidget* parent) : QTabWidget(parent)
+PropertyWidget_ColorTrans::PropertyWidget_ColorTrans(QWidget* parent) : QGroupBox(parent)
{
m_doc = NULL;
Modified: branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16617&path=/branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h Fri May 13 15:17:16 2011
@@ -17,7 +17,7 @@
class ScribusDoc;
class ScribusMainWindow;
-class SCRIBUS_API PropertyWidget_ColorTrans : public QTabWidget, Ui::PropertyWidget_ColorTransBase,
+class SCRIBUS_API PropertyWidget_ColorTrans : public QGroupBox, Ui::PropertyWidget_ColorTransBase,
public PropertyWidgetBase
{
Q_OBJECT
Modified: branches/ScribusOIF/scribus/ui/propertywidget_colortransbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16617&path=/branches/ScribusOIF/scribus/ui/propertywidget_colortransbase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_colortransbase.ui (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_colortransbase.ui Fri May 13 15:17:16 2011
@@ -1,53 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PropertyWidget_ColorTransBase</class>
- <widget class="QTabWidget" name="PropertyWidget_ColorTransBase">
+ <widget class="QGroupBox" name="PropertyWidget_ColorTransBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>305</width>
- <height>344</height>
+ <width>290</width>
+ <height>292</height>
</rect>
</property>
<property name="windowTitle">
- <string>TabWidget</string>
+ <string>GroupBox</string>
</property>
- <property name="currentIndex">
- <number>0</number>
+ <property name="title">
+ <string>Color && Transparency</string>
</property>
- <widget class="QWidget" name="colorTab">
- <attribute name="title">
- <string>Color</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
- <item>
- <widget class="PropertyWidget_Color" name="colorWidget" native="true"/>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="transTab">
- <attribute name="title">
- <string>Transparency</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
- <item>
- <widget class="PropertyWidget_Transparency" name="transWidget" native="true"/>
- </item>
- </layout>
- </widget>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="colorTab">
+ <attribute name="title">
+ <string>Color</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <property name="margin">
+ <number>2</number>
+ </property>
+ <item>
+ <widget class="PropertyWidget_Color" name="colorWidget" native="true"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="transTab">
+ <attribute name="title">
+ <string>Transparency</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <property name="margin">
+ <number>2</number>
+ </property>
+ <item>
+ <widget class="PropertyWidget_Transparency" name="transWidget" native="true"/>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
</widget>
<customwidgets>
<customwidget>
More information about the scribus-commit
mailing list