summaryrefslogtreecommitdiffstats
path: root/tools/designer/designer
diff options
context:
space:
mode:
Diffstat (limited to 'tools/designer/designer')
-rw-r--r--tools/designer/designer/designer-qt3.desktop145
-rw-r--r--tools/designer/designer/designer.pro13
-rw-r--r--tools/designer/designer/mainwindow.cpp8
-rw-r--r--tools/designer/designer/metadatabase.cpp6
-rw-r--r--tools/designer/designer/metadatabase.h2
-rw-r--r--tools/designer/designer/propertyeditor.cpp16
-rw-r--r--tools/designer/designer/resource.cpp4
-rw-r--r--tools/designer/designer/widgetfactory.cpp4
8 files changed, 175 insertions, 23 deletions
diff --git a/tools/designer/designer/designer-qt3.desktop b/tools/designer/designer/designer-qt3.desktop
new file mode 100644
index 0000000..1ac742e
--- /dev/null
+++ b/tools/designer/designer/designer-qt3.desktop
@@ -0,0 +1,145 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=designer-qt3
+Name=Qt3 Designer
+Name[bg]=Qt3 Дизайнер
+Name[br]=Ergrafer Qt3
+Name[ca]=Dissenyador Qt3
+Name[cs]=Qt3 designer
+Name[de]=Qt3-Designer
+Name[eo]=Qt3-Desegnilo
+Name[es]=Diseñador Qt3
+Name[et]=Qt3 disainer
+Name[eu]=Qt3 Diseinatzailea
+Name[gl]=Deseñador de Qt3
+Name[he]=Qt3 בצעמ
+Name[it]=Designer Qt3
+Name[ja]=Qt3デザイナー
+Name[ko]=Qt3 디자이너
+Name[lv]=Qt3 Dizainers
+Name[mk]=Qt3 дизајнер
+Name[no]=Qt3-designer
+Name[oc]=Dessinador Qt3
+Name[pl]=Projektant Qt3
+Name[sk]=Qt3 Dizajnér
+Name[sl]=Snovalnik Qt3
+Name[ta]=Qt3 À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер Qt3
+Name[zh_CN.GB2312]=Qt3 设计者
+Name[zh_TW.Big5]=Qt3 設計器
+GenericName=Interface Designer
+GenericName[af]=Koppelvlak Ontwerper
+GenericName[ar]=أداة لتصميم واجهة البرامج
+GenericName[az]=Ara Üz Tərtibçisi
+GenericName[bg]=Дизайнер на интерфейси
+GenericName[bn]=ইন্টারফেস পরিকল্পনা
+GenericName[bs]=Qt alat za dizajniranje interfejsa
+GenericName[ca]=Dissenyador d'interfícies
+GenericName[cs]=Návrhář rozhraní
+GenericName[cy]=Dylunydd Rhyngwyneb
+GenericName[da]=Grænsefladedesigner
+GenericName[de]=Schnittstellen-Designer
+GenericName[el]=Σχεδιαστής διασυνδέσεων
+GenericName[eo]=Interfacdesegnilo
+GenericName[es]=Diseñador de interfaces
+GenericName[et]=Kasutajaliidese disainer
+GenericName[eu]=Interfaze Diseinatzailea
+GenericName[fa]=طراح رابط
+GenericName[fi]=Käyttöliittymäsuunnittelija
+GenericName[fo]=Nýtaramótssniðari
+GenericName[fr]=Concepteur d'interface
+GenericName[gl]=Deseñador de Interfaces
+GenericName[he]=מעצב ממשקים
+GenericName[hi]=इंटरफेस डिज़ाइनर
+GenericName[hr]=Dizajner sučelja
+GenericName[hu]=Felülettervező
+GenericName[is]=Viðmótshönnun
+GenericName[it]=Disegnatore di interfacce
+GenericName[ja]=インターフェースデザイナー
+GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់
+GenericName[ko]=인터페이스 디자이너
+GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້
+GenericName[lt]=Sąsajos redaktorius
+GenericName[lv]=Starsejas Dizainers
+GenericName[mn]=Гадаргуун дизайнер
+GenericName[ms]=Pereka Antaramuka
+GenericName[mt]=Diżinjatur tal-interfaċċji
+GenericName[nb]=Utforming av grensesnitt
+GenericName[nl]=Interface-ontwerper
+GenericName[nn]=Utforming av grensesnitt
+GenericName[nso]=Mohlami wa Interface
+GenericName[pa]=ਇੰਟਰਫੇਸ ਡਿਜਾਇਨਰ
+GenericName[pl]=Projektowanie interfejsów
+GenericName[pt]=Editor de Interfaces
+GenericName[pt_BR]=Interface do Designer
+GenericName[ro]=Dezvoltator de interfeţe
+GenericName[ru]=Редактор интерфейса приложений Qt
+GenericName[se]=Laktahábmejeaddji
+GenericName[sk]=Návrh rozhrania
+GenericName[sl]=Snovalnik vmesnikov
+GenericName[sr]=Дизајнер интерфејса
+GenericName[sr@Latn]=Dizajner interfejsa
+GenericName[ss]=Umhleli wesichumanisi
+GenericName[sv]=Gränssnittseditor
+GenericName[ta]=முகப்புப் வடிவமைப்பாளர்
+GenericName[tg]=Тароҳи робита
+GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้
+GenericName[tr]=Arayüz tasarım programı
+GenericName[uk]=Дизайн інтерфейсу
+GenericName[uz]=Интерфейс дизайнери
+GenericName[ven]=Muvhati wa nga Phanda
+GenericName[vi]=Trình thiết kế giao diện
+GenericName[wa]=Dessineu d' eterfaces
+GenericName[xh]=Umyili Wezojongongano
+GenericName[xx]=xxInterface Designerxx
+GenericName[zh_CN]=界面设计器
+GenericName[zh_TW]=界面設計師
+GenericName[zu]=Umakhi Womxhumanisi
+Comment=Qt3 interface designer
+Comment[az]=Qt3 axtar üz dizayn proqramı
+Comment[bg]=Qt3 interface дизайнер
+Comment[br]=Ergrafer etrefas Qt3
+Comment[ca]=Dissenyador d'interfícies Qt3
+Comment[cs]=Editor UI pro Qt3
+Comment[da]=Qt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für Qt3
+Comment[el]=Σχεδιασμός περιβάλλοντων Qt3
+Comment[eo]=Qt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de Qt3
+Comment[et]=Qt3 dialoogide redaktor
+Comment[eu]=Qt3 interfaze diseinatzailea
+Comment[fi]=Qt3:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec Qt3
+Comment[gl]=Editor de interfaces de Qt3
+Comment[he]=Qt3-ל םיקשממ בצעמ
+Comment[hu]=Qt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir Qt3
+Comment[it]=Editor per le interfaccie Qt3
+Comment[ja]=Qt3インターフェースデザイナー
+Comment[ko]=Qt3 인터페이스 디자이너
+Comment[lt]=Qt3 sąsajos redaktorius
+Comment[lv]=Qt3 starsejas dizainers
+Comment[mk]=Дизајнер на Qt3 дијалози
+Comment[nl]=Qt3 interface-ontwerper
+Comment[no]=Qt3-grensesnittdesigner
+Comment[no_NY]=Redigering av Qt3-miljø
+Comment[oc]=Dessinador d'interfacies Qt3
+Comment[pl]=Projektant interfejsu Qt3
+Comment[pt]=Editor de interfaces do Qt3
+Comment[pt_BR]=Designer de interface Qt3
+Comment[ro]=Dezvoltator de interfeţe Qt3
+Comment[ru]=редактор интерфейсов приложений Qt3
+Comment[sk]=Qt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za Qt3
+Comment[sr]=Dizajner Qt3 interfejsa
+Comment[sv]=Editor för gränssnitt till Qt3
+Comment[ta]=Qt3 À¨¼ôÀ¡Ç÷
+Comment[tr]=Qt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для Qt3
+Comment[zh_CN.GB2312]=Qt3 界面设计程序
+Comment[zh_TW.Big5]=Qt3 介面編輯器
+MimeType=application/x-designer;
+Icon=designer-qt3
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro
index 91de514..9fe421c 100644
--- a/tools/designer/designer/designer.pro
+++ b/tools/designer/designer/designer.pro
@@ -429,14 +429,21 @@ hpux-acc* {
TRANSLATIONS = designer_de.ts designer_fr.ts
target.path=$$libs.path
-INSTALLS += target
templates.path=$$data.path/templates
templates.files = ../templates/*
-INSTALLS += templates
designertranlations.files = *.qm
designertranlations.path = $$translations.path
-INSTALLS += designertranlations
!macx-g++:PRECOMPILED_HEADER = designer_pch.h
+
+desktop.path = $$share.path/applications
+desktop.files = designer-qt3.desktop
+
+system( cp images/designer_appicon.png designer-qt3.png )
+
+icon.path = $$share.path/pixmaps
+icon.files = designer-qt3.png
+
+INSTALLS += target templates designertranlations desktop icon
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 1263c6b..4a786ed 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -1740,8 +1740,8 @@ void MainWindow::handleRMBProperties( int id, QMap<QString, int> &props, QWidget
if ( oldDoWrap != doWrap ) {
QString pn( tr( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
- "wordwrap", QVariant( oldDoWrap, 0 ),
- QVariant( doWrap, 0 ), QString::null, QString::null );
+ "wordwrap", QVariant( oldDoWrap ),
+ QVariant( doWrap ), QString::null, QString::null );
cmd->execute();
formWindow()->commandHistory()->addCommand( cmd );
MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE );
@@ -2647,8 +2647,8 @@ bool MainWindow::openEditor( QWidget *w, FormWindow *f )
if ( oldDoWrap != doWrap ) {
QString pn( tr( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
- "wordwrap", QVariant( oldDoWrap, 0 ),
- QVariant( doWrap, 0 ), QString::null, QString::null );
+ "wordwrap", QVariant( oldDoWrap ),
+ QVariant( doWrap ), QString::null, QString::null );
cmd->execute();
formWindow()->commandHistory()->addCommand( cmd );
MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE );
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index 48422b1..9aba982 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -64,7 +64,7 @@ class MetaDataBaseRecord
public:
QObject *object;
QStringList changedProperties;
- QMap<QString,QVariant> fakeProperties;
+ QStringVariantMap fakeProperties;
QMap<QString, QString> propertyComments;
int spacing, margin;
QString resizeMode;
@@ -272,14 +272,14 @@ QVariant MetaDataBase::fakeProperty( QObject * o, const QString &property)
o, o->name(), o->className() );
return QVariant();
}
- QMap<QString, QVariant>::Iterator it = r->fakeProperties.find( property );
+ QStringVariantMap::Iterator it = r->fakeProperties.find( property );
if ( it != r->fakeProperties.end() )
return r->fakeProperties[property];
return WidgetFactory::defaultValue( o, property );
}
-QMap<QString,QVariant>* MetaDataBase::fakeProperties( QObject* o )
+QStringVariantMap* MetaDataBase::fakeProperties( QObject* o )
{
setupDataBase();
MetaDataBaseRecord *r = db->find( (void*)o );
diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h
index 707cc69..dc34d24 100644
--- a/tools/designer/designer/metadatabase.h
+++ b/tools/designer/designer/metadatabase.h
@@ -162,7 +162,7 @@ public:
static void setFakeProperty( QObject *o, const QString &property, const QVariant& value );
static QVariant fakeProperty( QObject * o, const QString &property );
- static QMap<QString,QVariant>* fakeProperties( QObject* o );
+ static QStringVariantMap* fakeProperties( QObject* o );
static void setSpacing( QObject *o, int spacing );
static int spacing( QObject *o );
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 98d299c..c1cde23 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -1103,7 +1103,7 @@ PropertyBoolItem::~PropertyBoolItem()
void PropertyBoolItem::toggle()
{
bool b = value().toBool();
- setValue( QVariant( !b, 0 ) );
+ setValue( QVariant( !b ) );
setValue();
}
@@ -1158,7 +1158,7 @@ void PropertyBoolItem::setValue()
return;
setText( 1, combo()->currentText() );
bool b = combo()->currentItem() == 0 ? (bool)FALSE : (bool)TRUE;
- PropertyItem::setValue( QVariant( b, 0 ) );
+ PropertyItem::setValue( QVariant( b ) );
notifyValueChange();
}
@@ -1900,13 +1900,13 @@ void PropertyFontItem::initChildren()
} else if ( item->name() == tr( "Point Size" ) )
item->setValue( val.toFont().pointSize() );
else if ( item->name() == tr( "Bold" ) )
- item->setValue( QVariant( val.toFont().bold(), 0 ) );
+ item->setValue( QVariant( val.toFont().bold() ) );
else if ( item->name() == tr( "Italic" ) )
- item->setValue( QVariant( val.toFont().italic(), 0 ) );
+ item->setValue( QVariant( val.toFont().italic() ) );
else if ( item->name() == tr( "Underline" ) )
- item->setValue( QVariant( val.toFont().underline(), 0 ) );
+ item->setValue( QVariant( val.toFont().underline() ) );
else if ( item->name() == tr( "Strikeout" ) )
- item->setValue( QVariant( val.toFont().strikeOut(), 0 ) );
+ item->setValue( QVariant( val.toFont().strikeOut() ) );
}
}
@@ -3702,9 +3702,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
} else if ( i->name() == "wordwrap" ) {
int align = editor->widget()->property( "alignment" ).toInt();
if ( align & WordBreak )
- i->setValue( QVariant( TRUE, 0 ) );
+ i->setValue( QVariant( true ) );
else
- i->setValue( QVariant( FALSE, 0 ) );
+ i->setValue( QVariant( false ) );
} else if ( i->name() == "layoutSpacing" ) {
( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ) ) );
} else if ( i->name() == "layoutMargin" ) {
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index b6fc689..2ba2eb1 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -1501,8 +1501,8 @@ void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent )
}
if ( w->isWidgetType() && MetaDataBase::fakeProperties( w ) ) {
- QMap<QString, QVariant>* fakeProperties = MetaDataBase::fakeProperties( w );
- for ( QMap<QString, QVariant>::Iterator fake = fakeProperties->begin();
+ QStringVariantMap* fakeProperties = MetaDataBase::fakeProperties( w );
+ for ( QStringVariantMap::Iterator fake = fakeProperties->begin();
fake != fakeProperties->end(); ++fake ) {
if ( MetaDataBase::isPropertyChanged( w, fake.key() ) ) {
if ( w->inherits("CustomWidget") ) {
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 3757f5c..9ae35f4 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -1486,13 +1486,13 @@ QVariant WidgetFactory::defaultValue( QObject *w, const QString &propName )
{
if ( propName == "wordwrap" ) {
int v = defaultValue( w, "alignment" ).toInt();
- return QVariant( ( v & WordBreak ) == WordBreak, 0 );
+ return QVariant( ( v & WordBreak ) == WordBreak );
} else if ( propName == "toolTip" || propName == "whatsThis" ) {
return QVariant( QString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) {
return QVariant();
} else if ( propName == "frameworkCode" ) {
- return QVariant( TRUE, 0 );
+ return QVariant( true );
} else if ( propName == "layoutMargin" || propName == "layoutSpacing" ) {
return QVariant( -1 );
}