diff --git a/ui/images/down.png b/ui/images/down.png new file mode 100755 index 0000000..288419b Binary files /dev/null and b/ui/images/down.png differ diff --git a/ui/images/up.png b/ui/images/up.png new file mode 100755 index 0000000..6cfc4f7 Binary files /dev/null and b/ui/images/up.png differ diff --git a/ui/interface.py b/ui/interface.py index b262b01..1b252b3 100644 --- a/ui/interface.py +++ b/ui/interface.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'interface.ui' # -# Created: Sun Jun 14 21:55:56 2009 +# Created: Sat Jun 20 17:44:08 2009 # by: PyQt4 UI code generator 4.4.4 # # WARNING! All changes made in this file will be lost! @@ -12,17 +12,22 @@ from PyQt4 import QtCore, QtGui class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 600) + MainWindow.resize(804, 600) self.centralwidget = QtGui.QWidget(MainWindow) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth()) + self.centralwidget.setSizePolicy(sizePolicy) self.centralwidget.setObjectName("centralwidget") self.gridLayoutWidget = QtGui.QWidget(self.centralwidget) - self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 10, 781, 541)) + self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 0, 781, 541)) self.gridLayoutWidget.setObjectName("gridLayoutWidget") self.gridLayout = QtGui.QGridLayout(self.gridLayoutWidget) - self.gridLayout.setSizeConstraint(QtGui.QLayout.SetMaximumSize) + self.gridLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint) self.gridLayout.setObjectName("gridLayout") self.list_songs = QtGui.QListWidget(self.gridLayoutWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Expanding) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Ignored) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.list_songs.sizePolicy().hasHeightForWidth()) @@ -31,21 +36,47 @@ class Ui_MainWindow(object): self.gridLayout.addWidget(self.list_songs, 1, 0, 1, 1) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.btn_new_song = QtGui.QPushButton(self.gridLayoutWidget) - self.btn_new_song.setObjectName("btn_new_song") - self.horizontalLayout.addWidget(self.btn_new_song) self.btn_delete_song = QtGui.QPushButton(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Ignored) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_delete_song.sizePolicy().hasHeightForWidth()) + self.btn_delete_song.setSizePolicy(sizePolicy) self.btn_delete_song.setObjectName("btn_delete_song") self.horizontalLayout.addWidget(self.btn_delete_song) + self.btn_list_move_up = QtGui.QPushButton(self.gridLayoutWidget) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap("ui/images/up.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_list_move_up.setIcon(icon) + self.btn_list_move_up.setObjectName("btn_list_move_up") + self.horizontalLayout.addWidget(self.btn_list_move_up) + self.btn_list_move_down = QtGui.QPushButton(self.gridLayoutWidget) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap("ui/images/down.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_list_move_down.setIcon(icon1) + self.btn_list_move_down.setObjectName("btn_list_move_down") + self.horizontalLayout.addWidget(self.btn_list_move_down) self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 2, 1) self.verticalLayout = QtGui.QVBoxLayout() + self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint) self.verticalLayout.setObjectName("verticalLayout") self.gridLayout_2 = QtGui.QGridLayout() + self.gridLayout_2.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint) self.gridLayout_2.setObjectName("gridLayout_2") self.le_title = QtGui.QLineEdit(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.le_title.sizePolicy().hasHeightForWidth()) + self.le_title.setSizePolicy(sizePolicy) self.le_title.setObjectName("le_title") self.gridLayout_2.addWidget(self.le_title, 0, 1, 1, 1) self.le_tauthor = QtGui.QLineEdit(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.le_tauthor.sizePolicy().hasHeightForWidth()) + self.le_tauthor.setSizePolicy(sizePolicy) self.le_tauthor.setObjectName("le_tauthor") self.gridLayout_2.addWidget(self.le_tauthor, 1, 1, 1, 1) self.label = QtGui.QLabel(self.gridLayoutWidget) @@ -55,15 +86,30 @@ class Ui_MainWindow(object): self.label_2.setObjectName("label_2") self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1) self.le_mauthor = QtGui.QLineEdit(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.le_mauthor.sizePolicy().hasHeightForWidth()) + self.le_mauthor.setSizePolicy(sizePolicy) self.le_mauthor.setObjectName("le_mauthor") self.gridLayout_2.addWidget(self.le_mauthor, 2, 1, 1, 1) self.label_3 = QtGui.QLabel(self.gridLayoutWidget) self.label_3.setObjectName("label_3") self.gridLayout_2.addWidget(self.label_3, 2, 0, 1, 1) self.le_year = QtGui.QLineEdit(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.le_year.sizePolicy().hasHeightForWidth()) + self.le_year.setSizePolicy(sizePolicy) self.le_year.setObjectName("le_year") self.gridLayout_2.addWidget(self.le_year, 3, 1, 1, 1) self.le_tone = QtGui.QLineEdit(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.le_tone.sizePolicy().hasHeightForWidth()) + self.le_tone.setSizePolicy(sizePolicy) self.le_tone.setObjectName("le_tone") self.gridLayout_2.addWidget(self.le_tone, 4, 1, 1, 1) self.label_4 = QtGui.QLabel(self.gridLayoutWidget) @@ -74,16 +120,40 @@ class Ui_MainWindow(object): self.gridLayout_2.addWidget(self.label_5, 4, 0, 1, 1) self.verticalLayout.addLayout(self.gridLayout_2) self.te_body = QtGui.QTextEdit(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.te_body.sizePolicy().hasHeightForWidth()) + self.te_body.setSizePolicy(sizePolicy) self.te_body.setAcceptRichText(False) self.te_body.setObjectName("te_body") self.verticalLayout.addWidget(self.te_body) self.gridLayout.addLayout(self.verticalLayout, 1, 1, 1, 1) self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint) self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.btn_savesong = QtGui.QPushButton(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_savesong.sizePolicy().hasHeightForWidth()) + self.btn_savesong.setSizePolicy(sizePolicy) self.btn_savesong.setObjectName("btn_savesong") self.horizontalLayout_2.addWidget(self.btn_savesong) + self.btn_new_song = QtGui.QPushButton(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_new_song.sizePolicy().hasHeightForWidth()) + self.btn_new_song.setSizePolicy(sizePolicy) + self.btn_new_song.setObjectName("btn_new_song") + self.horizontalLayout_2.addWidget(self.btn_new_song) self.btn_create_pdf = QtGui.QPushButton(self.gridLayoutWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_create_pdf.sizePolicy().hasHeightForWidth()) + self.btn_create_pdf.setSizePolicy(sizePolicy) self.btn_create_pdf.setObjectName("btn_create_pdf") self.horizontalLayout_2.addWidget(self.btn_create_pdf) self.gridLayout.addLayout(self.horizontalLayout_2, 2, 1, 2, 1) @@ -97,7 +167,7 @@ class Ui_MainWindow(object): self.gridLayout.addWidget(self.label_7, 0, 1, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 23)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 804, 23)) self.menubar.setObjectName("menubar") self.menuFile = QtGui.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -149,7 +219,6 @@ class Ui_MainWindow(object): def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "SongBook Editor 0.2", None, QtGui.QApplication.UnicodeUTF8)) - self.btn_new_song.setText(QtGui.QApplication.translate("MainWindow", "Nuova Canzone", None, QtGui.QApplication.UnicodeUTF8)) self.btn_delete_song.setText(QtGui.QApplication.translate("MainWindow", "Elimina Canzone", None, QtGui.QApplication.UnicodeUTF8)) self.label.setText(QtGui.QApplication.translate("MainWindow", "Titolo", None, QtGui.QApplication.UnicodeUTF8)) self.label_2.setText(QtGui.QApplication.translate("MainWindow", "Autore", None, QtGui.QApplication.UnicodeUTF8)) @@ -157,6 +226,7 @@ class Ui_MainWindow(object): self.label_4.setText(QtGui.QApplication.translate("MainWindow", "Anno", None, QtGui.QApplication.UnicodeUTF8)) self.label_5.setText(QtGui.QApplication.translate("MainWindow", "Tonalità", None, QtGui.QApplication.UnicodeUTF8)) self.btn_savesong.setText(QtGui.QApplication.translate("MainWindow", "Aggiungi al canzoniere", None, QtGui.QApplication.UnicodeUTF8)) + self.btn_new_song.setText(QtGui.QApplication.translate("MainWindow", "Nuova Canzone", None, QtGui.QApplication.UnicodeUTF8)) self.btn_create_pdf.setText(QtGui.QApplication.translate("MainWindow", "Esporta canzoniere in PDF", None, QtGui.QApplication.UnicodeUTF8)) self.label_6.setText(QtGui.QApplication.translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" diff --git a/ui/interface.ui b/ui/interface.ui index ab09a11..9e8b503 100644 --- a/ui/interface.ui +++ b/ui/interface.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>800</width> + <width>804</width> <height>600</height> </rect> </property> @@ -14,23 +14,29 @@ <string>SongBook Editor 0.2</string> </property> <widget class="QWidget" name="centralwidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <widget class="QWidget" name="gridLayoutWidget"> <property name="geometry"> <rect> <x>10</x> - <y>10</y> + <y>0</y> <width>781</width> <height>541</height> </rect> </property> <layout class="QGridLayout" name="gridLayout"> <property name="sizeConstraint"> - <enum>QLayout::SetMaximumSize</enum> + <enum>QLayout::SetDefaultConstraint</enum> </property> <item row="1" column="0"> <widget class="QListWidget" name="list_songs"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Expanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Ignored"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -40,16 +46,37 @@ <item row="2" column="0" rowspan="2"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="btn_new_song"> + <widget class="QPushButton" name="btn_delete_song"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Ignored"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> - <string>Nuova Canzone</string> + <string>Elimina Canzone</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="btn_delete_song"> + <widget class="QPushButton" name="btn_list_move_up"> <property name="text"> - <string>Elimina Canzone</string> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>ui/images/up.png</normaloff>ui/images/up.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="btn_list_move_down"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>ui/images/down.png</normaloff>ui/images/down.png</iconset> </property> </widget> </item> @@ -57,13 +84,33 @@ </item> <item row="1" column="1"> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> <item> <layout class="QGridLayout" name="gridLayout_2"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> <item row="0" column="1"> - <widget class="QLineEdit" name="le_title"/> + <widget class="QLineEdit" name="le_title"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="le_tauthor"/> + <widget class="QLineEdit" name="le_tauthor"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item row="0" column="0"> <widget class="QLabel" name="label"> @@ -80,7 +127,14 @@ </widget> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="le_mauthor"/> + <widget class="QLineEdit" name="le_mauthor"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item row="2" column="0"> <widget class="QLabel" name="label_3"> @@ -90,10 +144,24 @@ </widget> </item> <item row="3" column="1"> - <widget class="QLineEdit" name="le_year"/> + <widget class="QLineEdit" name="le_year"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item row="4" column="1"> - <widget class="QLineEdit" name="le_tone"/> + <widget class="QLineEdit" name="le_tone"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item row="3" column="0"> <widget class="QLabel" name="label_4"> @@ -113,6 +181,12 @@ </item> <item> <widget class="QTextEdit" name="te_body"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="acceptRichText"> <bool>false</bool> </property> @@ -122,15 +196,43 @@ </item> <item row="2" column="1" rowspan="2"> <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> <item> <widget class="QPushButton" name="btn_savesong"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string>Aggiungi al canzoniere</string> </property> </widget> </item> <item> + <widget class="QPushButton" name="btn_new_song"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Nuova Canzone</string> + </property> + </widget> + </item> + <item> <widget class="QPushButton" name="btn_create_pdf"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string>Esporta canzoniere in PDF</string> </property> @@ -174,7 +276,7 @@ p, li { white-space: pre-wrap; } <rect> <x>0</x> <y>0</y> - <width>800</width> + <width>804</width> <height>23</height> </rect> </property>
