luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP

This commit is contained in:
Matthias Koefferlein 2021-11-25 19:53:00 +01:00
parent 646a207e00
commit c3010745ec
17 changed files with 442 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/edt/edt/EditablePathPropertiesPage.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>EditablePathPropertiesPage</class> <class>EditablePathPropertiesPage</class>
<widget class="QWidget" name="EditablePathPropertiesPage"> <widget class="QWidget" name="EditablePathPropertiesPage">
@ -13,7 +14,16 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -27,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>456</width> <width>456</width>
<height>16</height> <height>16</height>
@ -65,12 +75,21 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="font"> <property name="font">
@ -92,9 +111,7 @@
<item> <item>
<widget class="QLabel" name="layer_lbl"> <widget class="QLabel" name="layer_lbl">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -130,9 +147,7 @@
<item row="2" column="1" colspan="2"> <item row="2" column="1" colspan="2">
<widget class="QTextEdit" name="ptlist_le"> <widget class="QTextEdit" name="ptlist_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -140,9 +155,6 @@
<property name="lineWidth"> <property name="lineWidth">
<number>2</number> <number>2</number>
</property> </property>
<property name="tabStopWidth" >
<number>100</number>
</property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="3"> <item row="8" column="0" colspan="3">
@ -154,18 +166,27 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>211</width> <width>211</width>
<height>20</height> <height>20</height>
@ -199,12 +220,21 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
@ -215,9 +245,7 @@
<item> <item>
<widget class="QLineEdit" name="start_ext_le"> <widget class="QLineEdit" name="start_ext_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -234,9 +262,7 @@
<item> <item>
<widget class="QLineEdit" name="end_ext_le"> <widget class="QLineEdit" name="end_ext_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -249,9 +275,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="width_le"> <widget class="QLineEdit" name="width_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -263,7 +287,7 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>191</width> <width>191</width>
<height>25</height> <height>25</height>
@ -281,9 +305,7 @@
<item row="3" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QComboBox" name="type_cb"> <widget class="QComboBox" name="type_cb">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

86
src/edt/edt/PathPropertiesPage.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PathPropertiesPage</class> <class>PathPropertiesPage</class>
<widget class="QWidget" name="PathPropertiesPage"> <widget class="QWidget" name="PathPropertiesPage">
@ -13,7 +14,16 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -28,12 +38,21 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
@ -44,9 +63,7 @@
<item> <item>
<widget class="QLineEdit" name="start_ext_le"> <widget class="QLineEdit" name="start_ext_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -63,9 +80,7 @@
<item> <item>
<widget class="QLineEdit" name="end_ext_le"> <widget class="QLineEdit" name="end_ext_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -98,18 +113,27 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>211</width> <width>211</width>
<height>20</height> <height>20</height>
@ -137,9 +161,7 @@
<item row="2" column="1" colspan="2"> <item row="2" column="1" colspan="2">
<widget class="QTextEdit" name="ptlist_le"> <widget class="QTextEdit" name="ptlist_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -147,9 +169,6 @@
<property name="lineWidth"> <property name="lineWidth">
<number>2</number> <number>2</number>
</property> </property>
<property name="tabStopWidth" >
<number>100</number>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="5" column="0" colspan="3">
@ -160,7 +179,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>451</width> <width>451</width>
<height>8</height> <height>8</height>
@ -173,7 +192,7 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>135</width> <width>135</width>
<height>20</height> <height>20</height>
@ -191,9 +210,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="width_le"> <widget class="QLineEdit" name="width_le">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -226,12 +243,21 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="font"> <property name="font">
@ -253,9 +279,7 @@
<item> <item>
<widget class="QLabel" name="layer_lbl"> <widget class="QLabel" name="layer_lbl">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

65
src/edt/edt/PolygonPropertiesPage.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PolygonPropertiesPage</class> <class>PolygonPropertiesPage</class>
<widget class="QWidget" name="PolygonPropertiesPage"> <widget class="QWidget" name="PolygonPropertiesPage">
@ -13,7 +14,16 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -24,7 +34,7 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -35,9 +45,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="pointCountLabel"> <widget class="QLabel" name="pointCountLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -80,12 +88,21 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="font"> <property name="font">
@ -107,9 +124,7 @@
<item> <item>
<widget class="QLabel" name="layer_lbl"> <widget class="QLabel" name="layer_lbl">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -134,18 +149,27 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>211</width> <width>211</width>
<height>20</height> <height>20</height>
@ -170,12 +194,10 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item rowspan="3" row="1" column="1" > <item row="1" column="1" rowspan="3">
<widget class="QTextEdit" name="pointListEdit"> <widget class="QTextEdit" name="pointListEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -183,9 +205,6 @@
<property name="lineWidth"> <property name="lineWidth">
<number>2</number> <number>2</number>
</property> </property>
<property name="tabStopWidth" >
<number>100</number>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
@ -196,7 +215,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>470</width> <width>470</width>
<height>16</height> <height>16</height>

18
src/edt/edt/edtPropertiesPages.cc
View File

@ -388,6 +388,12 @@ PolygonPropertiesPage::PolygonPropertiesPage (edt::Service *service, db::Manager
setupUi (this); setupUi (this);
setup (); setup ();
#if QT_VERSION >= 0x60000
pointListEdit->setTabStopDistance (100);
#else
pointListEdit->setTabStopWidth (100);
#endif
connect (inst_pb, SIGNAL (clicked ()), this, SLOT (show_inst ())); connect (inst_pb, SIGNAL (clicked ()), this, SLOT (show_inst ()));
connect (prop_pb, SIGNAL (clicked ()), this, SLOT (show_props ())); connect (prop_pb, SIGNAL (clicked ()), this, SLOT (show_props ()));
@ -905,6 +911,12 @@ PathPropertiesPage::PathPropertiesPage (edt::Service *service, db::Manager *mana
setupUi (this); setupUi (this);
setup (); setup ();
#if QT_VERSION >= 0x60000
ptlist_le->setTabStopDistance (100);
#else
ptlist_le->setTabStopWidth (100);
#endif
connect (inst_pb, SIGNAL (clicked ()), this, SLOT (show_inst ())); connect (inst_pb, SIGNAL (clicked ()), this, SLOT (show_inst ()));
connect (prop_pb, SIGNAL (clicked ()), this, SLOT (show_props ())); connect (prop_pb, SIGNAL (clicked ()), this, SLOT (show_props ()));
@ -966,6 +978,12 @@ EditablePathPropertiesPage::EditablePathPropertiesPage (edt::Service *service, d
setupUi (this); setupUi (this);
setup (); setup ();
#if QT_VERSION >= 0x60000
ptlist_le->setTabStopDistance (100);
#else
ptlist_le->setTabStopWidth (100);
#endif
connect (inst_pb, SIGNAL (clicked ()), this, SLOT (show_inst ())); connect (inst_pb, SIGNAL (clicked ()), this, SLOT (show_inst ()));
connect (prop_pb, SIGNAL (clicked ()), this, SLOT (show_props ())); connect (prop_pb, SIGNAL (clicked ()), this, SLOT (show_props ()));
connect (type_cb, SIGNAL (currentIndexChanged (int)), this, SLOT (type_selected (int))); connect (type_cb, SIGNAL (currentIndexChanged (int)), this, SLOT (type_selected (int)));

1
src/lay/lay/layGSIHelpProvider.cc
View File

@ -33,6 +33,7 @@
#include <QColor> #include <QColor>
#include <QPalette> #include <QPalette>
#include <QApplication> #include <QApplication>
#include <QRegExp>
#include <cstdio> #include <cstdio>
#include <cctype> #include <cctype>

4
src/lay/lay/layMacroEditorDialog.cc
View File

@ -1550,7 +1550,11 @@ int
MacroEditorDialog::columns () MacroEditorDialog::columns ()
{ {
QFontMetrics fm (mp_console_text->font ()); QFontMetrics fm (mp_console_text->font ());
#if QT_VERSION >= 0x60000
int cw = fm.horizontalAdvance (QString::fromUtf8 ("X"));
#else
int cw = fm.width (QString::fromUtf8 ("X")); int cw = fm.width (QString::fromUtf8 ("X"));
#endif
if (cw > 0) { if (cw > 0) {
return mp_console_text->viewport ()->width () / cw; return mp_console_text->viewport ()->width () / cw;
} else { } else {

16
src/lay/lay/layMacroEditorPage.cc
View File

@ -343,7 +343,13 @@ void MacroEditorSidePanel::set_debugging_on (bool on)
QSize MacroEditorSidePanel::sizeHint () const QSize MacroEditorSidePanel::sizeHint () const
{ {
return QSize (QFontMetrics (mp_text->font ()).width (QString::fromUtf8 ("12345")) + 3 * sidePanelMargin + m_breakpoint_pixmap.width (), 0); int w;
#if QT_VERSION >= 0x60000
w = QFontMetrics (mp_text->font ()).horizontalAdvance (QString::fromUtf8 ("12345"));
#else
w = QFontMetrics (mp_text->font ()).width (QString::fromUtf8 ("12345"));
#endif
return QSize (w + 3 * sidePanelMargin + m_breakpoint_pixmap.width (), 0);
} }
void MacroEditorSidePanel::mousePressEvent (QMouseEvent *event) void MacroEditorSidePanel::mousePressEvent (QMouseEvent *event)
@ -502,7 +508,11 @@ MacroEditorPage::MacroEditorPage (QWidget * /*parent*/, MacroEditorHighlighters
hlayout->addWidget (mp_text); hlayout->addWidget (mp_text);
mp_text->setWordWrapMode(QTextOption::NoWrap); mp_text->setWordWrapMode(QTextOption::NoWrap);
#if QT_VERSION >= 0x60000
mp_text->setTabStopDistance (m_ntab * QFontMetrics (mp_text->font ()).horizontalAdvance (QString::fromUtf8 ("x")));
#else
mp_text->setTabStopWidth (m_ntab * QFontMetrics (mp_text->font ()).width (QString::fromUtf8 ("x"))); mp_text->setTabStopWidth (m_ntab * QFontMetrics (mp_text->font ()).width (QString::fromUtf8 ("x")));
#endif
m_is_modified = false; m_is_modified = false;
connect (mp_text, SIGNAL (textChanged ()), this, SLOT (text_changed ())); connect (mp_text, SIGNAL (textChanged ()), this, SLOT (text_changed ()));
@ -959,7 +969,11 @@ void MacroEditorPage::set_ntab (int n)
{ {
if (n != m_ntab) { if (n != m_ntab) {
m_ntab = n; m_ntab = n;
#if QT_VERSION >= 0x60000
mp_text->setTabStopDistance (m_ntab * QFontMetrics (mp_text->font ()).horizontalAdvance (QString::fromUtf8 ("x")));
#else
mp_text->setTabStopWidth (m_ntab * QFontMetrics (mp_text->font ()).width (QString::fromUtf8 ("x"))); mp_text->setTabStopWidth (m_ntab * QFontMetrics (mp_text->font ()).width (QString::fromUtf8 ("x")));
#endif
} }
} }

3
src/lay/lay/layMacroEditorPage.h
View File

@ -20,8 +20,6 @@
*/ */
#ifndef HDR_layMacroEditorPage #ifndef HDR_layMacroEditorPage
#define HDR_layMacroEditorPage #define HDR_layMacroEditorPage
@ -32,6 +30,7 @@
#include <QDialog> #include <QDialog>
#include <QPixmap> #include <QPixmap>
#include <QRegExp>
#include <set> #include <set>

9
src/lay/lay/layMacroVariableView.cc
View File

@ -71,20 +71,17 @@ pretty_print (const tl::Variant &v)
} else if (v.is_double ()) { } else if (v.is_double ()) {
QString res; QString res (QString::fromUtf8 ("%.12g").arg (v.to_double ()));
res.sprintf ("%.12g", v.to_double ());
return res; return res;
} else if (v.is_char ()) { } else if (v.is_char ()) {
QString details; QString details (QString::fromUtf8 ("#%d (0x%x)").arg (v.to_int ()).arg (v.to_uint ()));
details.sprintf ("#%d (0x%x)", v.to_int (), v.to_uint ());
return tl::to_qstring (std::string ("'") + v.to_string () + "' ") + details; return tl::to_qstring (std::string ("'") + v.to_string () + "' ") + details;
} else if (v.is_ulong () || v.is_long () || v.is_ulonglong () || v.is_longlong ()) { } else if (v.is_ulong () || v.is_long () || v.is_ulonglong () || v.is_longlong ()) {
QString details; QString details (QString::fromUtf8 ("(0x%llx)").arg (v.to_ulonglong ()));
details.sprintf (" (0x%llx)", v.to_ulonglong ());
return tl::to_qstring (v.to_string ()) + details; return tl::to_qstring (v.to_string ()) + details;
} else { } else {

19
src/lay/lay/layMainWindow.cc
View File

@ -793,6 +793,15 @@ MainWindow::tech_message (const std::string &s)
mp_tech_status_label->setText(tl::to_qstring (s)); mp_tech_status_label->setText(tl::to_qstring (s));
} }
static int fm_width (const QFontMetrics &fm, const QString &s)
{
#if QT_VERSION >= 0x60000
return fm.horizontalAdvance (s);
#else
return fm.width (QString::fromUtf8 (s));
#endif
}
void void
MainWindow::format_message () MainWindow::format_message ()
{ {
@ -841,7 +850,7 @@ MainWindow::format_message ()
++ndrop; ++ndrop;
} while (short_message.size () < prev_len && fm.width (QString::fromUtf8 (" ") + tl::to_qstring (short_message)) > mp_msg_label->width ()); } while (short_message.size () < prev_len && fm_width (fm, QString::fromUtf8 (" ") + tl::to_qstring (short_message)) > mp_msg_label->width ());
mp_msg_label->setText (QString::fromUtf8 (" ") + tl::to_qstring (short_message)); mp_msg_label->setText (QString::fromUtf8 (" ") + tl::to_qstring (short_message));
mp_msg_label->setToolTip (tl::to_qstring (full_message)); mp_msg_label->setToolTip (tl::to_qstring (full_message));
@ -1579,7 +1588,11 @@ MainWindow::cm_print ()
QFont header_font (QString::fromUtf8 ("Helvetica"), 8); QFont header_font (QString::fromUtf8 ("Helvetica"), 8);
int hh = QFontMetrics (header_font, mp_printer.get ()).height (); int hh = QFontMetrics (header_font, mp_printer.get ()).height ();
QRect page_rect = mp_printer->pageRect (); #if QT_VERSION >= 0x60000
QRectF page_rect = mp_printer->pageRect (QPrinter::DevicePixel);
#else
QRectF page_rect = mp_printer->pageRect ();
#endif
page_rect.moveTo (0, 0); page_rect.moveTo (0, 0);
int b = std::min (page_rect.width (), page_rect.height ()) / 50; int b = std::min (page_rect.width (), page_rect.height ()) / 50;
@ -1588,7 +1601,7 @@ MainWindow::cm_print ()
page_rect.setTop (page_rect.top () + b); page_rect.setTop (page_rect.top () + b);
page_rect.setBottom (page_rect.bottom () - b); page_rect.setBottom (page_rect.bottom () - b);
QRect text_rect = page_rect; QRectF text_rect = page_rect;
text_rect.setLeft (text_rect.left () + hh / 2); text_rect.setLeft (text_rect.left () + hh / 2);
text_rect.setRight (text_rect.right () - hh / 2); text_rect.setRight (text_rect.right () - hh / 2);
text_rect.setBottom (text_rect.bottom () - hh / 2); text_rect.setBottom (text_rect.bottom () - hh / 2);

4
src/lay/lay/layProgressWidget.cc
View File

@ -90,7 +90,11 @@ QSize
ProgressBarWidget::sizeHint () const ProgressBarWidget::sizeHint () const
{ {
QFontMetrics fm (font ()); QFontMetrics fm (font ());
#if QT_VERSION >= 0x60000
return QSize (fm.horizontalAdvance (QString::fromUtf8("100%")) * 4, fm.height () + 2);
#else
return QSize (fm.width (QString::fromUtf8("100%")) * 4, fm.height () + 2); return QSize (fm.width (QString::fromUtf8("100%")) * 4, fm.height () + 2);
#endif
} }
QSize QSize

12
src/lay/lay/laySaltDownloadManager.cc
View File

@ -85,8 +85,8 @@ ConfirmationDialog::mark_fetching (const std::string &name)
if (i != m_items_by_name.end ()) { if (i != m_items_by_name.end ()) {
list->scrollToItem (i->second); list->scrollToItem (i->second);
for (int c = 0; c < list->columnCount (); ++c) { for (int c = 0; c < list->columnCount (); ++c) {
i->second->setData (c, Qt::BackgroundColorRole, QColor (224, 244, 244)); i->second->setData (c, Qt::BackgroundRole, QColor (224, 244, 244));
i->second->setData (c, Qt::TextColorRole, QColor (Qt::blue)); i->second->setData (c, Qt::ForegroundRole, QColor (Qt::blue));
} }
i->second->setData (1, Qt::DisplayRole, tr ("FETCHING")); i->second->setData (1, Qt::DisplayRole, tr ("FETCHING"));
} }
@ -101,8 +101,8 @@ ConfirmationDialog::mark_error (const std::string &name)
if (i != m_items_by_name.end ()) { if (i != m_items_by_name.end ()) {
list->scrollToItem (i->second); list->scrollToItem (i->second);
for (int c = 0; c < list->columnCount (); ++c) { for (int c = 0; c < list->columnCount (); ++c) {
i->second->setData (c, Qt::BackgroundColorRole, QColor (255, 224, 244)); i->second->setData (c, Qt::BackgroundRole, QColor (255, 224, 244));
i->second->setData (c, Qt::TextColorRole, QColor (Qt::black)); i->second->setData (c, Qt::ForegroundRole, QColor (Qt::black));
} }
i->second->setData (1, Qt::DisplayRole, tr ("ERROR")); i->second->setData (1, Qt::DisplayRole, tr ("ERROR"));
} }
@ -117,8 +117,8 @@ ConfirmationDialog::mark_success (const std::string &name)
if (i != m_items_by_name.end ()) { if (i != m_items_by_name.end ()) {
list->scrollToItem (i->second); list->scrollToItem (i->second);
for (int c = 0; c < list->columnCount (); ++c) { for (int c = 0; c < list->columnCount (); ++c) {
i->second->setData (c, Qt::BackgroundColorRole, QColor (160, 255, 160)); i->second->setData (c, Qt::BackgroundRole, QColor (160, 255, 160));
i->second->setData (c, Qt::TextColorRole, QColor (Qt::black)); i->second->setData (c, Qt::ForegroundRole, QColor (Qt::black));
} }
i->second->setData (1, Qt::DisplayRole, tr ("INSTALLED")); i->second->setData (1, Qt::DisplayRole, tr ("INSTALLED"));
} }

4
src/lay/lay/laySaltGrain.cc
View File

@ -463,7 +463,11 @@ SaltGrain::load (const std::string &p)
QResource res (tl::to_qstring (p)); QResource res (tl::to_qstring (p));
QByteArray data; QByteArray data;
#if QT_VERSION >= 0x60000
if (res.compressionAlgorithm () == QResource::ZlibCompression) {
#else
if (res.isCompressed ()) { if (res.isCompressed ()) {
#endif
data = qUncompress ((const unsigned char *)res.data (), (int)res.size ()); data = qUncompress ((const unsigned char *)res.data (), (int)res.size ());
} else { } else {
data = QByteArray ((const char *)res.data (), (int)res.size ()); data = QByteArray ((const char *)res.data (), (int)res.size ());

4
src/lay/lay/laySaltGrainDetailsTextWidget.cc
View File

@ -181,7 +181,11 @@ SaltGrainDetailsTextWidget::details_text ()
QBuffer buffer; QBuffer buffer;
buffer.open (QIODevice::WriteOnly); buffer.open (QIODevice::WriteOnly);
QTextStream stream (&buffer); QTextStream stream (&buffer);
#if QT_VERSION >= 0x60000
stream.setEncoding (QStringConverter::Utf8);
#else
stream.setCodec ("UTF-8"); stream.setCodec ("UTF-8");
#endif
stream << "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/></head><body>"; stream << "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/></head><body>";

1
src/lay/lay/laySaltManagerDialog.cc
View File

@ -43,6 +43,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QRegExp>
namespace lay namespace lay
{ {

4
src/lay/lay/laySearchReplaceDialog.cc
View File

@ -42,6 +42,7 @@
#include <QInputDialog> #include <QInputDialog>
#include <QHeaderView> #include <QHeaderView>
#include <QRegExp>
#include <fstream> #include <fstream>
@ -1249,8 +1250,7 @@ SearchReplaceDialog::update_mru_list ()
for (std::vector<std::string>::const_iterator mru = m_mru.begin (); mru != m_mru.end (); ++mru) { for (std::vector<std::string>::const_iterator mru = m_mru.begin (); mru != m_mru.end (); ++mru) {
QString text = tl::to_qstring (*mru); QString text = tl::to_qstring (*mru);
QString display_text = text; QString display_text = text.simplified ();
display_text.replace (QRegExp (QString::fromUtf8 ("\\s+")), QString::fromUtf8 (" "));
int nmax = 50; int nmax = 50;
if (display_text.size () > nmax) { if (display_text.size () > nmax) {
display_text = display_text.left (nmax) + QString::fromUtf8 ("..."); display_text = display_text.left (nmax) + QString::fromUtf8 ("...");

4
src/lay/lay/laySystemPaths.cc
View File

@ -65,7 +65,11 @@ split_path (const std::string &path, std::vector <std::string> &pc)
sep = QString::fromUtf8 (":"); sep = QString::fromUtf8 (":");
#endif #endif
#if QT_VERSION >= 0x60000
QStringList pp = tl::to_qstring (path).split (sep, Qt::SkipEmptyParts);
#else
QStringList pp = tl::to_qstring (path).split (sep, QString::SkipEmptyParts); QStringList pp = tl::to_qstring (path).split (sep, QString::SkipEmptyParts);
#endif
for (QStringList::ConstIterator p = pp.begin (); p != pp.end (); ++p) { for (QStringList::ConstIterator p = pp.begin (); p != pp.end (); ++p) {
pc.push_back (tl::to_string (*p)); pc.push_back (tl::to_string (*p));
} }