diff options
Diffstat (limited to 'media-gfx/imgseek')
-rw-r--r-- | media-gfx/imgseek/ChangeLog | 6 | ||||
-rw-r--r-- | media-gfx/imgseek/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/imgseek/files/imgSeek-0.8.4-sizetype.patch | 1109 | ||||
-rw-r--r-- | media-gfx/imgseek/imgseek-0.8.4.ebuild | 7 |
4 files changed, 11 insertions, 1116 deletions
diff --git a/media-gfx/imgseek/ChangeLog b/media-gfx/imgseek/ChangeLog index 3320b83cc753..02ebce380c2d 100644 --- a/media-gfx/imgseek/ChangeLog +++ b/media-gfx/imgseek/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/imgseek # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/ChangeLog,v 1.6 2005/02/22 21:05:17 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/ChangeLog,v 1.7 2005/03/06 15:53:41 carlo Exp $ + + 06 Mar 2005; Carsten Lohrke <carlo@gentoo.org> + -files/imgSeek-0.8.4-sizetype.patch, imgseek-0.8.4.ebuild: + removing large patch from cvs *imgseek-0.8.4 (22 Feb 2005) diff --git a/media-gfx/imgseek/Manifest b/media-gfx/imgseek/Manifest index 479a1e28482c..c1fba6fcb2fc 100644 --- a/media-gfx/imgseek/Manifest +++ b/media-gfx/imgseek/Manifest @@ -1,6 +1,5 @@ MD5 c4bc6a7297b40b8706d33906d861427c imgseek-0.8.2.ebuild 763 -MD5 cdc8bf76cd061d58b6fff65527d7bd03 imgseek-0.8.4.ebuild 873 -MD5 3e3f511727ae74df1bd77d50cac278b4 ChangeLog 903 -MD5 15fe35a05757b862292316cfdc0680aa files/imgSeek-0.8.4-sizetype.patch 68987 +MD5 62132720297b33b9dabea827d17bf48f imgseek-0.8.4.ebuild 940 +MD5 3b5d16a295197d7a85105b601923ade8 ChangeLog 1046 MD5 8551a8f7682f14334f01f842c0f48153 files/digest-imgseek-0.8.2 66 MD5 4444475d0d9fb5c1f4d1f341cabfd0a7 files/digest-imgseek-0.8.4 66 diff --git a/media-gfx/imgseek/files/imgSeek-0.8.4-sizetype.patch b/media-gfx/imgseek/files/imgSeek-0.8.4-sizetype.patch deleted file mode 100644 index da5478a3745f..000000000000 --- a/media-gfx/imgseek/files/imgSeek-0.8.4-sizetype.patch +++ /dev/null @@ -1,1109 +0,0 @@ - ---- imgSeekLib/BatchEditForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/BatchEditForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -438,7 +438,7 @@ - layout12 = QHBoxLayout(None,0,6,"layout12") - - self.textLabel3 = QLabel(self,"textLabel3") -- self.textLabel3.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel3.sizePolicy().hasHeightForWidth())) -+ self.textLabel3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel3.sizePolicy().hasHeightForWidth())) - layout12.addWidget(self.textLabel3) - - self.batchcombo = QComboBox(0,self,"batchcombo") -@@ -448,17 +448,17 @@ - layout12.addWidget(self.batchcombo) - - self.newbatchbtn = QPushButton(self,"newbatchbtn") -- self.newbatchbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.newbatchbtn.sizePolicy().hasHeightForWidth())) -+ self.newbatchbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.newbatchbtn.sizePolicy().hasHeightForWidth())) - self.newbatchbtn.setPixmap(self.image1) - layout12.addWidget(self.newbatchbtn) - - self.removebatchbtn = QPushButton(self,"removebatchbtn") -- self.removebatchbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.removebatchbtn.sizePolicy().hasHeightForWidth())) -+ self.removebatchbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.removebatchbtn.sizePolicy().hasHeightForWidth())) - self.removebatchbtn.setPixmap(self.image2) - layout12.addWidget(self.removebatchbtn) - - self.resetbatchesbtn = QPushButton(self,"resetbatchesbtn") -- self.resetbatchesbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.resetbatchesbtn.sizePolicy().hasHeightForWidth())) -+ self.resetbatchesbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.resetbatchesbtn.sizePolicy().hasHeightForWidth())) - self.resetbatchesbtn.setPixmap(self.image3) - layout12.addWidget(self.resetbatchesbtn) - batchformLayout.addLayout(layout12) -@@ -472,7 +472,7 @@ - layout11 = QHBoxLayout(None,0,6,"layout11") - - self.textLabel3_2 = QLabel(self,"textLabel3_2") -- self.textLabel3_2.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel3_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel3_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel3_2.sizePolicy().hasHeightForWidth())) - layout11.addWidget(self.textLabel3_2) - - self.actioncombo = QComboBox(0,self,"actioncombo") -@@ -482,7 +482,7 @@ - layout11.addWidget(self.actioncombo) - - self.applyactionbtn = QPushButton(self,"applyactionbtn") -- self.applyactionbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.applyactionbtn.sizePolicy().hasHeightForWidth())) -+ self.applyactionbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.applyactionbtn.sizePolicy().hasHeightForWidth())) - self.applyactionbtn.setPixmap(self.image0) - layout11.addWidget(self.applyactionbtn) - batchformLayout.addLayout(layout11) ---- imgSeekLib/RenameForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/RenameForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -200,7 +200,7 @@ - sourceLayout.addWidget(self.batchcombo,0,1) - - self.batchedbtn = QPushButton(self.source,"batchedbtn") -- self.batchedbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) -+ self.batchedbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) - self.batchedbtn.setPixmap(self.image0) - - sourceLayout.addWidget(self.batchedbtn,0,2) -@@ -219,12 +219,12 @@ - sourceLayout.addMultiCellWidget(self.htmlsourcelistbox,2,2,0,2) - - self.textLabel2_3 = QLabel(self.source,"textLabel2_3") -- self.textLabel2_3.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) - - sourceLayout.addWidget(self.textLabel2_3,0,0) - - self.textLabel2_3_2 = QLabel(self.source,"textLabel2_3_2") -- self.textLabel2_3_2.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel2_3_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_3_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel2_3_2.sizePolicy().hasHeightForWidth())) - - sourceLayout.addMultiCellWidget(self.textLabel2_3_2,1,1,0,1) - self.addPage(self.source,QString("")) -@@ -244,7 +244,7 @@ - buttonGroup1Layout.addMultiCellWidget(self.seriescheck,5,5,0,4) - - self.with = QLabel(self.buttonGroup1,"with") -- self.with.setSizePolicy(QSizePolicy(1,5,0,0,self.with.sizePolicy().hasHeightForWidth())) -+ self.with.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Preferred,0,0,self.with.sizePolicy().hasHeightForWidth())) - - buttonGroup1Layout.addWidget(self.with,4,3) - -@@ -297,7 +297,7 @@ - pageLayout.addItem(spacer19) - - self.textLabel2 = QLabel(self.page,"textLabel2") -- self.textLabel2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) - textLabel2_font = QFont(self.textLabel2.font()) - textLabel2_font.setFamily("Helvetica [Cronyx]") - textLabel2_font.setBold(1) -@@ -309,7 +309,7 @@ - lastpageLayout = QGridLayout(self.lastpage,1,1,0,4,"lastpageLayout") - - self.applybtn = QPushButton(self.lastpage,"applybtn") -- self.applybtn.setSizePolicy(QSizePolicy(0,0,0,0,self.applybtn.sizePolicy().hasHeightForWidth())) -+ self.applybtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.applybtn.sizePolicy().hasHeightForWidth())) - - lastpageLayout.addWidget(self.applybtn,1,0) - ---- imgSeekLib/MainForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/MainForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -2782,19 +2782,19 @@ - tabLayout_4.addMultiCellWidget(self.BrowseSysDirListView,1,1,0,3) - - self.gohomebtn = QPushButton(self.tab_4,"gohomebtn") -- self.gohomebtn.setSizePolicy(QSizePolicy(0,0,0,0,self.gohomebtn.sizePolicy().hasHeightForWidth())) -+ self.gohomebtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.gohomebtn.sizePolicy().hasHeightForWidth())) - self.gohomebtn.setPixmap(self.image1) - - tabLayout_4.addWidget(self.gohomebtn,0,0) - - self.bookmarkbtn = QPushButton(self.tab_4,"bookmarkbtn") -- self.bookmarkbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.bookmarkbtn.sizePolicy().hasHeightForWidth())) -+ self.bookmarkbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.bookmarkbtn.sizePolicy().hasHeightForWidth())) - self.bookmarkbtn.setPixmap(self.image2) - - tabLayout_4.addWidget(self.bookmarkbtn,0,1) - - self.browsesysoptionsbtn = QPushButton(self.tab_4,"browsesysoptionsbtn") -- self.browsesysoptionsbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.browsesysoptionsbtn.sizePolicy().hasHeightForWidth())) -+ self.browsesysoptionsbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.browsesysoptionsbtn.sizePolicy().hasHeightForWidth())) - self.browsesysoptionsbtn.setPixmap(self.image3) - - tabLayout_4.addWidget(self.browsesysoptionsbtn,0,2) -@@ -2816,36 +2816,36 @@ - tabLayout_5.addMultiCellWidget(self.BrowseSimCatIconView,2,2,0,5) - - self.textLabel1_2 = QLabel(self.tab_5,"textLabel1_2") -- self.textLabel1_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel1_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) - - tabLayout_5.addWidget(self.textLabel1_2,0,0) - - self.thresLabel = QLabel(self.tab_5,"thresLabel") -- self.thresLabel.setSizePolicy(QSizePolicy(0,0,0,0,self.thresLabel.sizePolicy().hasHeightForWidth())) -+ self.thresLabel.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.thresLabel.sizePolicy().hasHeightForWidth())) - - tabLayout_5.addMultiCellWidget(self.thresLabel,1,1,0,1) - - self.symoptionsbtn = QPushButton(self.tab_5,"symoptionsbtn") -- self.symoptionsbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.symoptionsbtn.sizePolicy().hasHeightForWidth())) -+ self.symoptionsbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.symoptionsbtn.sizePolicy().hasHeightForWidth())) - self.symoptionsbtn.setPixmap(self.image3) - - tabLayout_5.addWidget(self.symoptionsbtn,1,4) - - self.categorizeButton = QPushButton(self.tab_5,"categorizeButton") -- self.categorizeButton.setSizePolicy(QSizePolicy(0,0,0,0,self.categorizeButton.sizePolicy().hasHeightForWidth())) -+ self.categorizeButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.categorizeButton.sizePolicy().hasHeightForWidth())) - self.categorizeButton.setDefault(1) - self.categorizeButton.setIconSet(QIconSet(self.image4)) - - tabLayout_5.addWidget(self.categorizeButton,1,5) - - self.groupByCombo = QComboBox(0,self.tab_5,"groupByCombo") -- self.groupByCombo.setSizePolicy(QSizePolicy(7,0,0,0,self.groupByCombo.sizePolicy().hasHeightForWidth())) -+ self.groupByCombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.groupByCombo.sizePolicy().hasHeightForWidth())) - self.groupByCombo.setInsertionPolicy(QComboBox.NoInsertion) - - tabLayout_5.addMultiCellWidget(self.groupByCombo,0,0,1,5) - - self.thresEdit = QLineEdit(self.tab_5,"thresEdit") -- self.thresEdit.setSizePolicy(QSizePolicy(0,0,0,0,self.thresEdit.sizePolicy().hasHeightForWidth())) -+ self.thresEdit.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.thresEdit.sizePolicy().hasHeightForWidth())) - self.thresEdit.setMaximumSize(QSize(40,32767)) - - tabLayout_5.addWidget(self.thresEdit,1,2) -@@ -2860,7 +2860,7 @@ - layout42 = QVBoxLayout(LayoutWidget,0,0,"layout42") - - self.thumbLabel = QLabel(LayoutWidget,"thumbLabel") -- self.thumbLabel.setSizePolicy(QSizePolicy(2,0,0,0,self.thumbLabel.sizePolicy().hasHeightForWidth())) -+ self.thumbLabel.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Fixed,0,0,self.thumbLabel.sizePolicy().hasHeightForWidth())) - self.thumbLabel.setFrameShape(QLabel.ToolBarPanel) - layout42.addWidget(self.thumbLabel) - -@@ -2881,7 +2881,7 @@ - layout22.addWidget(self.FullView) - - self.fullviewLabel = QLineEdit(LayoutWidget_2,"fullviewLabel") -- self.fullviewLabel.setSizePolicy(QSizePolicy(2,0,0,0,self.fullviewLabel.sizePolicy().hasHeightForWidth())) -+ self.fullviewLabel.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Fixed,0,0,self.fullviewLabel.sizePolicy().hasHeightForWidth())) - self.fullviewLabel.setPaletteBackgroundColor(QColor(238,238,230)) - self.fullviewLabel.setFocusPolicy(QLineEdit.NoFocus) - self.fullviewLabel.setFrame(0) -@@ -2894,7 +2894,7 @@ - tabLayout_6 = QVBoxLayout(self.tab_6,4,4,"tabLayout_6") - - self.groupBox4 = QGroupBox(self.tab_6,"groupBox4") -- self.groupBox4.setSizePolicy(QSizePolicy(5,0,0,0,self.groupBox4.sizePolicy().hasHeightForWidth())) -+ self.groupBox4.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Fixed,0,0,self.groupBox4.sizePolicy().hasHeightForWidth())) - self.groupBox4.setColumnLayout(0,Qt.Vertical) - self.groupBox4.layout().setSpacing(4) - self.groupBox4.layout().setMargin(6) -@@ -2902,7 +2902,7 @@ - groupBox4Layout.setAlignment(Qt.AlignTop) - - self.textLabel1_2_2 = QLabel(self.groupBox4,"textLabel1_2_2") -- self.textLabel1_2_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel1_2_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel1_2_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel1_2_2.sizePolicy().hasHeightForWidth())) - groupBox4Layout.addWidget(self.textLabel1_2_2) - - self.addImageEdit = QComboBox(0,self.groupBox4,"addImageEdit") -@@ -2911,17 +2911,17 @@ - groupBox4Layout.addWidget(self.addImageEdit) - - self.AddImageMore = QPushButton(self.groupBox4,"AddImageMore") -- self.AddImageMore.setSizePolicy(QSizePolicy(0,0,0,0,self.AddImageMore.sizePolicy().hasHeightForWidth())) -+ self.AddImageMore.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.AddImageMore.sizePolicy().hasHeightForWidth())) - groupBox4Layout.addWidget(self.AddImageMore) - - self.addImageBtn = QPushButton(self.groupBox4,"addImageBtn") -- self.addImageBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.addImageBtn.sizePolicy().hasHeightForWidth())) -+ self.addImageBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.addImageBtn.sizePolicy().hasHeightForWidth())) - self.addImageBtn.setDefault(1) - self.addImageBtn.setIconSet(QIconSet(self.image5)) - groupBox4Layout.addWidget(self.addImageBtn) - - self.adddirrecursivecheckBox = QCheckBox(self.groupBox4,"adddirrecursivecheckBox") -- self.adddirrecursivecheckBox.setSizePolicy(QSizePolicy(0,0,0,0,self.adddirrecursivecheckBox.sizePolicy().hasHeightForWidth())) -+ self.adddirrecursivecheckBox.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.adddirrecursivecheckBox.sizePolicy().hasHeightForWidth())) - self.adddirrecursivecheckBox.setChecked(1) - groupBox4Layout.addWidget(self.adddirrecursivecheckBox) - tabLayout_6.addWidget(self.groupBox4) -@@ -2929,7 +2929,7 @@ - layout9 = QHBoxLayout(None,0,4,"layout9") - - self.groupBox3 = QGroupBox(self.tab_6,"groupBox3") -- self.groupBox3.setSizePolicy(QSizePolicy(5,5,0,0,self.groupBox3.sizePolicy().hasHeightForWidth())) -+ self.groupBox3.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred,0,0,self.groupBox3.sizePolicy().hasHeightForWidth())) - self.groupBox3.setColumnLayout(0,Qt.Vertical) - self.groupBox3.layout().setSpacing(4) - self.groupBox3.layout().setMargin(6) -@@ -2937,7 +2937,7 @@ - groupBox3Layout.setAlignment(Qt.AlignTop) - - self.VolumeCombo = QComboBox(0,self.groupBox3,"VolumeCombo") -- self.VolumeCombo.setSizePolicy(QSizePolicy(7,0,0,0,self.VolumeCombo.sizePolicy().hasHeightForWidth())) -+ self.VolumeCombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.VolumeCombo.sizePolicy().hasHeightForWidth())) - self.VolumeCombo.setEditable(1) - self.VolumeCombo.setAutoCompletion(1) - self.VolumeCombo.setDuplicatesEnabled(0) -@@ -2949,14 +2949,14 @@ - groupBox3Layout.addWidget(self.VolDescLabel,1,0) - - self.newvolbtn = QPushButton(self.groupBox3,"newvolbtn") -- self.newvolbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.newvolbtn.sizePolicy().hasHeightForWidth())) -+ self.newvolbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.newvolbtn.sizePolicy().hasHeightForWidth())) - self.newvolbtn.setPixmap(self.image6) - - groupBox3Layout.addWidget(self.newvolbtn,1,1) - layout9.addWidget(self.groupBox3) - - self.groupBox3_3 = QGroupBox(self.tab_6,"groupBox3_3") -- self.groupBox3_3.setSizePolicy(QSizePolicy(5,0,0,0,self.groupBox3_3.sizePolicy().hasHeightForWidth())) -+ self.groupBox3_3.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Fixed,0,0,self.groupBox3_3.sizePolicy().hasHeightForWidth())) - self.groupBox3_3.setColumnLayout(0,Qt.Vertical) - self.groupBox3_3.layout().setSpacing(4) - self.groupBox3_3.layout().setMargin(6) -@@ -2970,7 +2970,7 @@ - - self.GroupCombo = QComboBox(0,self.groupBox3_3,"GroupCombo") - self.GroupCombo.setEnabled(0) -- self.GroupCombo.setSizePolicy(QSizePolicy(7,0,0,0,self.GroupCombo.sizePolicy().hasHeightForWidth())) -+ self.GroupCombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.GroupCombo.sizePolicy().hasHeightForWidth())) - self.GroupCombo.setEditable(1) - self.GroupCombo.setAutoCompletion(1) - self.GroupCombo.setDuplicatesEnabled(0) -@@ -2982,7 +2982,7 @@ - groupBox3_3Layout.addWidget(self.groupDescLabel,2,0) - - self.newgroupbtn = QPushButton(self.groupBox3_3,"newgroupbtn") -- self.newgroupbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.newgroupbtn.sizePolicy().hasHeightForWidth())) -+ self.newgroupbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.newgroupbtn.sizePolicy().hasHeightForWidth())) - self.newgroupbtn.setPixmap(self.image6) - - groupBox3_3Layout.addWidget(self.newgroupbtn,2,1) -@@ -2990,7 +2990,7 @@ - tabLayout_6.addLayout(layout9) - - self.groupBox31 = QGroupBox(self.tab_6,"groupBox31") -- self.groupBox31.setSizePolicy(QSizePolicy(5,0,0,0,self.groupBox31.sizePolicy().hasHeightForWidth())) -+ self.groupBox31.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Fixed,0,0,self.groupBox31.sizePolicy().hasHeightForWidth())) - self.groupBox31.setColumnLayout(0,Qt.Vertical) - self.groupBox31.layout().setSpacing(4) - self.groupBox31.layout().setMargin(9) -@@ -2998,22 +2998,22 @@ - groupBox31Layout.setAlignment(Qt.AlignTop) - - self.textLabel5 = QLabel(self.groupBox31,"textLabel5") -- self.textLabel5.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel5.sizePolicy().hasHeightForWidth())) -+ self.textLabel5.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel5.sizePolicy().hasHeightForWidth())) - - groupBox31Layout.addWidget(self.textLabel5,0,0) - - self.textLabel5_2 = QLabel(self.groupBox31,"textLabel5_2") -- self.textLabel5_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel5_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel5_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel5_2.sizePolicy().hasHeightForWidth())) - - groupBox31Layout.addWidget(self.textLabel5_2,1,0) - - self.textLabel5_2_3 = QLabel(self.groupBox31,"textLabel5_2_3") -- self.textLabel5_2_3.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel5_2_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel5_2_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel5_2_3.sizePolicy().hasHeightForWidth())) - - groupBox31Layout.addWidget(self.textLabel5_2_3,2,0) - - self.textLabel5_2_2 = QLabel(self.groupBox31,"textLabel5_2_2") -- self.textLabel5_2_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel5_2_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel5_2_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel5_2_2.sizePolicy().hasHeightForWidth())) - - groupBox31Layout.addWidget(self.textLabel5_2_2,1,2) - -@@ -3026,12 +3026,12 @@ - groupBox31Layout.addWidget(self.ignoreSizeEdit,1,1) - - self.textLabel5_2_2_2 = QLabel(self.groupBox31,"textLabel5_2_2_2") -- self.textLabel5_2_2_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel5_2_2_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel5_2_2_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel5_2_2_2.sizePolicy().hasHeightForWidth())) - - groupBox31Layout.addWidget(self.textLabel5_2_2_2,2,2) - - self.textLabel5_3 = QLabel(self.groupBox31,"textLabel5_3") -- self.textLabel5_3.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel5_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel5_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel5_3.sizePolicy().hasHeightForWidth())) - - groupBox31Layout.addWidget(self.textLabel5_3,3,0) - -@@ -3071,7 +3071,7 @@ - groupBox6Layout.addWidget(self.extractexifcheck,1,1) - - self.probeextcheck = QCheckBox(self.groupBox6,"probeextcheck") -- self.probeextcheck.setSizePolicy(QSizePolicy(0,0,0,0,self.probeextcheck.sizePolicy().hasHeightForWidth())) -+ self.probeextcheck.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.probeextcheck.sizePolicy().hasHeightForWidth())) - self.probeextcheck.setChecked(0) - - groupBox6Layout.addWidget(self.probeextcheck,2,1) -@@ -3108,12 +3108,12 @@ - progressGroupLayout.addWidget(self.subprogressBar,2,0) - - self.progressLabel = QLabel(self.progressGroup,"progressLabel") -- self.progressLabel.setSizePolicy(QSizePolicy(7,5,0,0,self.progressLabel.sizePolicy().hasHeightForWidth())) -+ self.progressLabel.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Preferred,0,0,self.progressLabel.sizePolicy().hasHeightForWidth())) - - progressGroupLayout.addMultiCellWidget(self.progressLabel,0,1,0,3) - - self.textLabel2_2 = QLabel(self.progressGroup,"textLabel2_2") -- self.textLabel2_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel2_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel2_2.sizePolicy().hasHeightForWidth())) - - progressGroupLayout.addMultiCellWidget(self.textLabel2_2,1,2,1,1) - -@@ -3127,7 +3127,7 @@ - progressGroupLayout.addWidget(self.stopAddBtn,2,3) - - self.progressList = QListBox(self.progressGroup,"progressList") -- self.progressList.setSizePolicy(QSizePolicy(7,7,0,0,self.progressList.sizePolicy().hasHeightForWidth())) -+ self.progressList.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.progressList.sizePolicy().hasHeightForWidth())) - - progressGroupLayout.addMultiCellWidget(self.progressList,3,3,0,3) - tabLayout_6.addWidget(self.progressGroup) -@@ -3144,7 +3144,7 @@ - - self.searchtabWidget = QTabWidget(self.search2splitter,"searchtabWidget") - self.searchtabWidget.setEnabled(1) -- self.searchtabWidget.setSizePolicy(QSizePolicy(7,1,0,0,self.searchtabWidget.sizePolicy().hasHeightForWidth())) -+ self.searchtabWidget.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Minimum,0,0,self.searchtabWidget.sizePolicy().hasHeightForWidth())) - self.searchtabWidget.setAutoMask(0) - self.searchtabWidget.setTabPosition(QTabWidget.Top) - self.searchtabWidget.setTabShape(QTabWidget.Rounded) -@@ -3153,14 +3153,14 @@ - tabLayout_7 = QVBoxLayout(self.tab_7,4,4,"tabLayout_7") - - self.queryImagetabWidget = QTabWidget(self.tab_7,"queryImagetabWidget") -- self.queryImagetabWidget.setSizePolicy(QSizePolicy(7,0,0,0,self.queryImagetabWidget.sizePolicy().hasHeightForWidth())) -+ self.queryImagetabWidget.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.queryImagetabWidget.sizePolicy().hasHeightForWidth())) - self.queryImagetabWidget.setMaximumSize(QSize(32767,32767)) - - self.tab_8 = QWidget(self.queryImagetabWidget,"tab_8") - tabLayout_8 = QGridLayout(self.tab_8,1,1,4,4,"tabLayout_8") - - self.SearchImagePixmap = QLabel(self.tab_8,"SearchImagePixmap") -- self.SearchImagePixmap.setSizePolicy(QSizePolicy(7,7,0,0,self.SearchImagePixmap.sizePolicy().hasHeightForWidth())) -+ self.SearchImagePixmap.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.SearchImagePixmap.sizePolicy().hasHeightForWidth())) - self.SearchImagePixmap.setMaximumSize(QSize(128,128)) - self.SearchImagePixmap.setPaletteForegroundColor(QColor(255,255,255)) - self.SearchImagePixmap.setPaletteBackgroundColor(QColor(0,0,0)) -@@ -3169,7 +3169,7 @@ - tabLayout_8.addMultiCellWidget(self.SearchImagePixmap,0,1,1,1) - - self.SearchImageMore = QPushButton(self.tab_8,"SearchImageMore") -- self.SearchImageMore.setSizePolicy(QSizePolicy(0,0,0,0,self.SearchImageMore.sizePolicy().hasHeightForWidth())) -+ self.SearchImageMore.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.SearchImageMore.sizePolicy().hasHeightForWidth())) - self.SearchImageMore.setMaximumSize(QSize(70,32767)) - - tabLayout_8.addWidget(self.SearchImageMore,1,2) -@@ -3177,7 +3177,7 @@ - tabLayout_8.addItem(spacer7_2,1,3) - - self.SearchImportcombo = QComboBox(0,self.tab_8,"SearchImportcombo") -- self.SearchImportcombo.setSizePolicy(QSizePolicy(7,0,0,0,self.SearchImportcombo.sizePolicy().hasHeightForWidth())) -+ self.SearchImportcombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.SearchImportcombo.sizePolicy().hasHeightForWidth())) - self.SearchImportcombo.setEditable(1) - self.SearchImportcombo.setInsertionPolicy(QComboBox.NoInsertion) - self.SearchImportcombo.setAutoCompletion(1) -@@ -3192,13 +3192,13 @@ - layout18 = QHBoxLayout(None,0,4,"layout18") - - self.DrawQueryPixmap = Painting(self.tab_9,"DrawQueryPixmap") -- self.DrawQueryPixmap.setSizePolicy(QSizePolicy(0,0,0,0,self.DrawQueryPixmap.sizePolicy().hasHeightForWidth())) -+ self.DrawQueryPixmap.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.DrawQueryPixmap.sizePolicy().hasHeightForWidth())) - self.DrawQueryPixmap.setMinimumSize(QSize(128,128)) - self.DrawQueryPixmap.setMaximumSize(QSize(128,128)) - layout18.addWidget(self.DrawQueryPixmap) - - self.DrawQueryColorPixmap = ColorClickableLabel(self.tab_9,"DrawQueryColorPixmap") -- self.DrawQueryColorPixmap.setSizePolicy(QSizePolicy(0,0,0,0,self.DrawQueryColorPixmap.sizePolicy().hasHeightForWidth())) -+ self.DrawQueryColorPixmap.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.DrawQueryColorPixmap.sizePolicy().hasHeightForWidth())) - self.DrawQueryColorPixmap.setScaledContents(0) - layout18.addWidget(self.DrawQueryColorPixmap) - tabLayout_9.addLayout(layout18) -@@ -3206,11 +3206,11 @@ - layout15 = QHBoxLayout(None,0,4,"layout15") - - self.textLabel2_2_2 = QLabel(self.tab_9,"textLabel2_2_2") -- self.textLabel2_2_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel2_2_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_2_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel2_2_2.sizePolicy().hasHeightForWidth())) - layout15.addWidget(self.textLabel2_2_2) - - self.brushsizeslider = QSlider(self.tab_9,"brushsizeslider") -- self.brushsizeslider.setSizePolicy(QSizePolicy(0,0,0,0,self.brushsizeslider.sizePolicy().hasHeightForWidth())) -+ self.brushsizeslider.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.brushsizeslider.sizePolicy().hasHeightForWidth())) - self.brushsizeslider.setMinValue(1) - self.brushsizeslider.setMaxValue(50) - self.brushsizeslider.setValue(7) -@@ -3220,11 +3220,11 @@ - layout15_2 = QHBoxLayout(None,0,4,"layout15_2") - - self.textLabel2_2_2_2 = QLabel(self.tab_9,"textLabel2_2_2_2") -- self.textLabel2_2_2_2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel2_2_2_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_2_2_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel2_2_2_2.sizePolicy().hasHeightForWidth())) - layout15_2.addWidget(self.textLabel2_2_2_2) - - self.colorSamplepixmapLabel = QLabel(self.tab_9,"colorSamplepixmapLabel") -- self.colorSamplepixmapLabel.setSizePolicy(QSizePolicy(0,0,0,0,self.colorSamplepixmapLabel.sizePolicy().hasHeightForWidth())) -+ self.colorSamplepixmapLabel.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.colorSamplepixmapLabel.sizePolicy().hasHeightForWidth())) - self.colorSamplepixmapLabel.setMinimumSize(QSize(1,1)) - self.colorSamplepixmapLabel.setFrameShape(QLabel.Box) - self.colorSamplepixmapLabel.setScaledContents(1) -@@ -3235,23 +3235,23 @@ - layout19 = QHBoxLayout(None,0,4,"layout19") - - self.sketchescomboBox = QComboBox(0,self.tab_9,"sketchescomboBox") -- self.sketchescomboBox.setSizePolicy(QSizePolicy(7,0,0,0,self.sketchescomboBox.sizePolicy().hasHeightForWidth())) -+ self.sketchescomboBox.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.sketchescomboBox.sizePolicy().hasHeightForWidth())) - self.sketchescomboBox.setMinimumSize(QSize(0,0)) - self.sketchescomboBox.setInsertionPolicy(QComboBox.AtTop) - layout19.addWidget(self.sketchescomboBox) - - self.savedrawbtn = QPushButton(self.tab_9,"savedrawbtn") -- self.savedrawbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.savedrawbtn.sizePolicy().hasHeightForWidth())) -+ self.savedrawbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.savedrawbtn.sizePolicy().hasHeightForWidth())) - self.savedrawbtn.setPixmap(self.image8) - layout19.addWidget(self.savedrawbtn) - - self.EraserBtn = QPushButton(self.tab_9,"EraserBtn") -- self.EraserBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.EraserBtn.sizePolicy().hasHeightForWidth())) -+ self.EraserBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.EraserBtn.sizePolicy().hasHeightForWidth())) - self.EraserBtn.setPixmap(self.image9) - layout19.addWidget(self.EraserBtn) - - self.ResetSketchBtn = QPushButton(self.tab_9,"ResetSketchBtn") -- self.ResetSketchBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.ResetSketchBtn.sizePolicy().hasHeightForWidth())) -+ self.ResetSketchBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.ResetSketchBtn.sizePolicy().hasHeightForWidth())) - self.ResetSketchBtn.setPixmap(self.image10) - layout19.addWidget(self.ResetSketchBtn) - tabLayout_9.addLayout(layout19) -@@ -3263,25 +3263,25 @@ - tabLayout_10 = QGridLayout(self.tab_10,1,1,4,4,"tabLayout_10") - - self.textLabel7_3 = QLabel(self.tab_10,"textLabel7_3") -- self.textLabel7_3.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel7_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel7_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel7_3.sizePolicy().hasHeightForWidth())) - - tabLayout_10.addMultiCellWidget(self.textLabel7_3,0,0,0,1) - - self.queryhistorycombo = QComboBox(0,self.tab_10,"queryhistorycombo") -- self.queryhistorycombo.setSizePolicy(QSizePolicy(7,0,0,0,self.queryhistorycombo.sizePolicy().hasHeightForWidth())) -+ self.queryhistorycombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.queryhistorycombo.sizePolicy().hasHeightForWidth())) - self.queryhistorycombo.setAutoCompletion(1) - self.queryhistorycombo.setDuplicatesEnabled(0) - - tabLayout_10.addMultiCellWidget(self.queryhistorycombo,0,0,2,4) - - self.resetqueryhistorybtn = QPushButton(self.tab_10,"resetqueryhistorybtn") -- self.resetqueryhistorybtn.setSizePolicy(QSizePolicy(0,0,0,0,self.resetqueryhistorybtn.sizePolicy().hasHeightForWidth())) -+ self.resetqueryhistorybtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.resetqueryhistorybtn.sizePolicy().hasHeightForWidth())) - self.resetqueryhistorybtn.setPixmap(self.image10) - - tabLayout_10.addWidget(self.resetqueryhistorybtn,1,4) - - self.logicCombo = QComboBox(0,self.tab_10,"logicCombo") -- self.logicCombo.setSizePolicy(QSizePolicy(0,0,0,0,self.logicCombo.sizePolicy().hasHeightForWidth())) -+ self.logicCombo.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.logicCombo.sizePolicy().hasHeightForWidth())) - - tabLayout_10.addMultiCellWidget(self.logicCombo,1,1,1,2) - spacer8_2 = QSpacerItem(411,20,QSizePolicy.Expanding,QSizePolicy.Minimum) -@@ -3299,7 +3299,7 @@ - tabLayout_10.addMultiCellWidget(self.querytable,2,2,0,4) - - self.textLabel3 = QLabel(self.tab_10,"textLabel3") -- self.textLabel3.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel3.sizePolicy().hasHeightForWidth())) -+ self.textLabel3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel3.sizePolicy().hasHeightForWidth())) - - tabLayout_10.addWidget(self.textLabel3,1,0) - self.searchtabWidget.insertTab(self.tab_10,QString("")) -@@ -3310,7 +3310,7 @@ - self.AvailableGroupsListView = DragListView(self.tab_11,"AvailableGroupsListView") - self.AvailableGroupsListView.addColumn(self.__tr("Name")) - self.AvailableGroupsListView.addColumn(self.__tr("Size")) -- self.AvailableGroupsListView.setSizePolicy(QSizePolicy(2,2,0,0,self.AvailableGroupsListView.sizePolicy().hasHeightForWidth())) -+ self.AvailableGroupsListView.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Ignored,0,0,self.AvailableGroupsListView.sizePolicy().hasHeightForWidth())) - self.AvailableGroupsListView.setPaletteForegroundColor(QColor(255,255,255)) - self.AvailableGroupsListView.setPaletteBackgroundColor(QColor(0,0,0)) - self.AvailableGroupsListView.setAcceptDrops(1) -@@ -3322,7 +3322,7 @@ - tabLayout_11.addMultiCellWidget(self.AvailableGroupsListView,0,1,0,0) - - self.groupBox12_2_2 = QGroupBox(self.tab_11,"groupBox12_2_2") -- self.groupBox12_2_2.setSizePolicy(QSizePolicy(2,2,0,0,self.groupBox12_2_2.sizePolicy().hasHeightForWidth())) -+ self.groupBox12_2_2.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Ignored,0,0,self.groupBox12_2_2.sizePolicy().hasHeightForWidth())) - self.groupBox12_2_2.setColumnLayout(0,Qt.Vertical) - self.groupBox12_2_2.layout().setSpacing(4) - self.groupBox12_2_2.layout().setMargin(4) -@@ -3332,7 +3332,7 @@ - self.dontShowTheseListView = DragListView(self.groupBox12_2_2,"dontShowTheseListView") - self.dontShowTheseListView.addColumn(self.__tr("Name")) - self.dontShowTheseListView.addColumn(self.__tr("Size")) -- self.dontShowTheseListView.setSizePolicy(QSizePolicy(2,2,0,0,self.dontShowTheseListView.sizePolicy().hasHeightForWidth())) -+ self.dontShowTheseListView.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Ignored,0,0,self.dontShowTheseListView.sizePolicy().hasHeightForWidth())) - self.dontShowTheseListView.setPaletteForegroundColor(QColor(255,255,255)) - self.dontShowTheseListView.setPaletteBackgroundColor(QColor(0,0,0)) - self.dontShowTheseListView.setAcceptDrops(1) -@@ -3345,7 +3345,7 @@ - tabLayout_11.addWidget(self.groupBox12_2_2,1,1) - - self.groupBox12_2 = QGroupBox(self.tab_11,"groupBox12_2") -- self.groupBox12_2.setSizePolicy(QSizePolicy(2,2,0,0,self.groupBox12_2.sizePolicy().hasHeightForWidth())) -+ self.groupBox12_2.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Ignored,0,0,self.groupBox12_2.sizePolicy().hasHeightForWidth())) - self.groupBox12_2.setColumnLayout(0,Qt.Vertical) - self.groupBox12_2.layout().setSpacing(4) - self.groupBox12_2.layout().setMargin(4) -@@ -3355,7 +3355,7 @@ - self.showTheseListView = DragListView(self.groupBox12_2,"showTheseListView") - self.showTheseListView.addColumn(self.__tr("Name")) - self.showTheseListView.addColumn(self.__tr("Size")) -- self.showTheseListView.setSizePolicy(QSizePolicy(2,2,0,0,self.showTheseListView.sizePolicy().hasHeightForWidth())) -+ self.showTheseListView.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Ignored,0,0,self.showTheseListView.sizePolicy().hasHeightForWidth())) - self.showTheseListView.setPaletteForegroundColor(QColor(255,255,255)) - self.showTheseListView.setPaletteBackgroundColor(QColor(0,0,0)) - self.showTheseListView.setAcceptDrops(1) -@@ -3367,12 +3367,12 @@ - groupBox12_2Layout.addMultiCellWidget(self.showTheseListView,0,0,0,3) - - self.groupLogicCombo = QComboBox(0,self.groupBox12_2,"groupLogicCombo") -- self.groupLogicCombo.setSizePolicy(QSizePolicy(0,0,0,0,self.groupLogicCombo.sizePolicy().hasHeightForWidth())) -+ self.groupLogicCombo.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.groupLogicCombo.sizePolicy().hasHeightForWidth())) - - groupBox12_2Layout.addWidget(self.groupLogicCombo,1,3) - - self.textLabel1_4 = QLabel(self.groupBox12_2,"textLabel1_4") -- self.textLabel1_4.setSizePolicy(QSizePolicy(1,5,0,0,self.textLabel1_4.sizePolicy().hasHeightForWidth())) -+ self.textLabel1_4.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Preferred,0,0,self.textLabel1_4.sizePolicy().hasHeightForWidth())) - - groupBox12_2Layout.addWidget(self.textLabel1_4,1,2) - -@@ -3401,18 +3401,18 @@ - groupBox5Layout.setAlignment(Qt.AlignTop) - - self.textLabel2_3 = QLabel(self.groupBox5,"textLabel2_3") -- self.textLabel2_3.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) - groupBox5Layout.addWidget(self.textLabel2_3) - - self.SearchFromImageResultsSpin = QSpinBox(self.groupBox5,"SearchFromImageResultsSpin") -- self.SearchFromImageResultsSpin.setSizePolicy(QSizePolicy(0,0,0,0,self.SearchFromImageResultsSpin.sizePolicy().hasHeightForWidth())) -+ self.SearchFromImageResultsSpin.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.SearchFromImageResultsSpin.sizePolicy().hasHeightForWidth())) - self.SearchFromImageResultsSpin.setMaxValue(256) - self.SearchFromImageResultsSpin.setMinValue(1) - self.SearchFromImageResultsSpin.setValue(10) - groupBox5Layout.addWidget(self.SearchFromImageResultsSpin) - - self.SearchImageBtn = QPushButton(self.groupBox5,"SearchImageBtn") -- self.SearchImageBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.SearchImageBtn.sizePolicy().hasHeightForWidth())) -+ self.SearchImageBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.SearchImageBtn.sizePolicy().hasHeightForWidth())) - self.SearchImageBtn.setPixmap(self.image11) - self.SearchImageBtn.setDefault(1) - groupBox5Layout.addWidget(self.SearchImageBtn) -@@ -3424,17 +3424,17 @@ - groupBox5Layout.addWidget(self.line1) - - self.previousSearchBtn = QPushButton(self.groupBox5,"previousSearchBtn") -- self.previousSearchBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.previousSearchBtn.sizePolicy().hasHeightForWidth())) -+ self.previousSearchBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.previousSearchBtn.sizePolicy().hasHeightForWidth())) - self.previousSearchBtn.setPixmap(self.image12) - groupBox5Layout.addWidget(self.previousSearchBtn) - - self.randomSearchBtn = QPushButton(self.groupBox5,"randomSearchBtn") -- self.randomSearchBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.randomSearchBtn.sizePolicy().hasHeightForWidth())) -+ self.randomSearchBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.randomSearchBtn.sizePolicy().hasHeightForWidth())) - self.randomSearchBtn.setPixmap(self.image13) - groupBox5Layout.addWidget(self.randomSearchBtn) - - self.queryoptionsbtn = QPushButton(self.groupBox5,"queryoptionsbtn") -- self.queryoptionsbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.queryoptionsbtn.sizePolicy().hasHeightForWidth())) -+ self.queryoptionsbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.queryoptionsbtn.sizePolicy().hasHeightForWidth())) - self.queryoptionsbtn.setPixmap(self.image3) - groupBox5Layout.addWidget(self.queryoptionsbtn) - layout18_2.addWidget(self.groupBox5) -@@ -3461,7 +3461,7 @@ - layout41.addWidget(self.FullView2) - - self.fullviewLabel2 = QLineEdit(LayoutWidget_4,"fullviewLabel2") -- self.fullviewLabel2.setSizePolicy(QSizePolicy(2,0,0,0,self.fullviewLabel2.sizePolicy().hasHeightForWidth())) -+ self.fullviewLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Fixed,0,0,self.fullviewLabel2.sizePolicy().hasHeightForWidth())) - self.fullviewLabel2.setPaletteBackgroundColor(QColor(238,238,230)) - self.fullviewLabel2.setFrame(0) - self.fullviewLabel2.setReadOnly(1) -@@ -3495,7 +3495,7 @@ - groupBox11Layout.addWidget(self.textLabel1_3,0,0) - - self.slidedelayspin = QSpinBox(self.groupBox11,"slidedelayspin") -- self.slidedelayspin.setSizePolicy(QSizePolicy(0,0,0,0,self.slidedelayspin.sizePolicy().hasHeightForWidth())) -+ self.slidedelayspin.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.slidedelayspin.sizePolicy().hasHeightForWidth())) - self.slidedelayspin.setMaxValue(9999) - self.slidedelayspin.setMinValue(0) - self.slidedelayspin.setValue(3) -@@ -3536,11 +3536,11 @@ - tabLayout_13 = QVBoxLayout(self.tab_13,4,4,"tabLayout_13") - - self.textLabel6 = QLabel(self.tab_13,"textLabel6") -- self.textLabel6.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel6.sizePolicy().hasHeightForWidth())) -+ self.textLabel6.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel6.sizePolicy().hasHeightForWidth())) - tabLayout_13.addWidget(self.textLabel6) - - self.clickactioncombo = QComboBox(0,self.tab_13,"clickactioncombo") -- self.clickactioncombo.setSizePolicy(QSizePolicy(7,0,0,0,self.clickactioncombo.sizePolicy().hasHeightForWidth())) -+ self.clickactioncombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.clickactioncombo.sizePolicy().hasHeightForWidth())) - self.clickactioncombo.setAutoCompletion(1) - tabLayout_13.addWidget(self.clickactioncombo) - -@@ -3584,7 +3584,7 @@ - tabLayout_15.addItem(spacer9_2,4,1) - - self.textLabel1 = QLabel(self.tab_15,"textLabel1") -- self.textLabel1.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) -+ self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) - - tabLayout_15.addWidget(self.textLabel1,0,0) - self.optionstabwidget.insertTab(self.tab_15,QString("")) ---- imgSeekLib/GroupPickerForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/GroupPickerForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -144,7 +144,7 @@ - GroupPickerFormLayout.addMultiCellWidget(self.groupCombo,2,2,1,2) - - self.okbtn = QPushButton(self,"okbtn") -- self.okbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.okbtn.sizePolicy().hasHeightForWidth())) -+ self.okbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.okbtn.sizePolicy().hasHeightForWidth())) - self.okbtn.setPixmap(self.image0) - - GroupPickerFormLayout.addWidget(self.okbtn,2,3) -@@ -160,12 +160,12 @@ - GroupPickerFormLayout.addMultiCellWidget(self.BrowseCategListView,1,1,0,3) - - self.textLabel1 = QLabel(self,"textLabel1") -- self.textLabel1.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) -+ self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) - - GroupPickerFormLayout.addWidget(self.textLabel1,2,0) - - self.textLabel1_2 = QLabel(self,"textLabel1_2") -- self.textLabel1_2.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel1_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) - - GroupPickerFormLayout.addMultiCellWidget(self.textLabel1_2,0,0,0,1) - ---- imgSeekLib/DuplicateForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/DuplicateForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -428,7 +428,7 @@ - sourceLayout.addMultiCellWidget(self.recursecheck,3,3,0,2) - - self.textLabel2_3 = QLabel(self.source,"textLabel2_3") -- self.textLabel2_3.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) - - sourceLayout.addWidget(self.textLabel2_3,0,0) - -@@ -440,7 +440,7 @@ - sourceLayout.addWidget(self.batchcombo,0,1) - - self.batchedbtn = QPushButton(self.source,"batchedbtn") -- self.batchedbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) -+ self.batchedbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) - self.batchedbtn.setPixmap(self.image0) - - sourceLayout.addWidget(self.batchedbtn,0,2) -@@ -451,7 +451,7 @@ - sourceLayout.addMultiCellWidget(self.htmlsourcelistbox,2,2,0,2) - - self.textLabel2_3_2 = QLabel(self.source,"textLabel2_3_2") -- self.textLabel2_3_2.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel2_3_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_3_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel2_3_2.sizePolicy().hasHeightForWidth())) - - sourceLayout.addMultiCellWidget(self.textLabel2_3_2,1,1,0,1) - self.addPage(self.source,QString("")) -@@ -499,12 +499,12 @@ - groupBox12Layout.addMultiCellWidget(self.avglumcompcheck,0,1,0,0) - - self.avglthresedit = QLineEdit(self.groupBox12,"avglthresedit") -- self.avglthresedit.setSizePolicy(QSizePolicy(1,0,0,0,self.avglthresedit.sizePolicy().hasHeightForWidth())) -+ self.avglthresedit.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.avglthresedit.sizePolicy().hasHeightForWidth())) - - groupBox12Layout.addWidget(self.avglthresedit,1,1) - - self.textLabel1 = QLabel(self.groupBox12,"textLabel1") -- self.textLabel1.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) -+ self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) - - groupBox12Layout.addWidget(self.textLabel1,0,1) - -@@ -518,13 +518,13 @@ - groupBox13Layout.setAlignment(Qt.AlignTop) - - self.textLabel1_2 = QLabel(self.groupBox13,"textLabel1_2") -- self.textLabel1_2.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) -+ self.textLabel1_2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) - - groupBox13Layout.addWidget(self.textLabel1_2,1,0) - - self.simthresdedit = QLineEdit(self.groupBox13,"simthresdedit") - self.simthresdedit.setEnabled(0) -- self.simthresdedit.setSizePolicy(QSizePolicy(1,0,0,0,self.simthresdedit.sizePolicy().hasHeightForWidth())) -+ self.simthresdedit.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.simthresdedit.sizePolicy().hasHeightForWidth())) - - groupBox13Layout.addWidget(self.simthresdedit,1,1) - -@@ -547,7 +547,7 @@ - pageLayout.addWidget(self.groupBox2) - - self.textLabel2 = QLabel(self.page,"textLabel2") -- self.textLabel2.setSizePolicy(QSizePolicy(5,0,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Fixed,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) - textLabel2_font = QFont(self.textLabel2.font()) - textLabel2_font.setFamily("Helvetica [Cronyx]") - textLabel2_font.setBold(1) -@@ -559,7 +559,7 @@ - lastpageLayout = QGridLayout(self.lastpage,1,1,0,4,"lastpageLayout") - - self.resultLabel = QLabel(self.lastpage,"resultLabel") -- self.resultLabel.setSizePolicy(QSizePolicy(5,1,0,0,self.resultLabel.sizePolicy().hasHeightForWidth())) -+ self.resultLabel.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Minimum,0,0,self.resultLabel.sizePolicy().hasHeightForWidth())) - resultLabel_font = QFont(self.resultLabel.font()) - resultLabel_font.setFamily("Helvetica [Cronyx]") - resultLabel_font.setBold(1) -@@ -580,13 +580,13 @@ - lastpageLayout.addMultiCellWidget(self.reslist,1,1,0,2) - - self.removefilebtn = QPushButton(self.lastpage,"removefilebtn") -- self.removefilebtn.setSizePolicy(QSizePolicy(0,0,0,0,self.removefilebtn.sizePolicy().hasHeightForWidth())) -+ self.removefilebtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.removefilebtn.sizePolicy().hasHeightForWidth())) - self.removefilebtn.setPixmap(self.image1) - - lastpageLayout.addWidget(self.removefilebtn,0,2) - - self.stopdupbtn = QPushButton(self.lastpage,"stopdupbtn") -- self.stopdupbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.stopdupbtn.sizePolicy().hasHeightForWidth())) -+ self.stopdupbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.stopdupbtn.sizePolicy().hasHeightForWidth())) - self.stopdupbtn.setPixmap(self.image2) - - lastpageLayout.addWidget(self.stopdupbtn,0,1) ---- imgSeekLib/ExportForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/ExportForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -223,7 +223,7 @@ - groupBox5Layout.addWidget(self.destpathedit) - - self.morebtn = QPushButton(self.groupBox5,"morebtn") -- self.morebtn.setSizePolicy(QSizePolicy(0,0,0,0,self.morebtn.sizePolicy().hasHeightForWidth())) -+ self.morebtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.morebtn.sizePolicy().hasHeightForWidth())) - groupBox5Layout.addWidget(self.morebtn) - - ExportFormLayout.addMultiCellWidget(self.groupBox5,2,2,0,1) -@@ -250,18 +250,18 @@ - batchgroupLayout.setAlignment(Qt.AlignTop) - - self.textLabel2 = QLabel(self.batchgroup,"textLabel2") -- self.textLabel2.setSizePolicy(QSizePolicy(1,5,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Preferred,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) - batchgroupLayout.addWidget(self.textLabel2) - - self.batchcombo = QComboBox(0,self.batchgroup,"batchcombo") -- self.batchcombo.setSizePolicy(QSizePolicy(7,0,0,0,self.batchcombo.sizePolicy().hasHeightForWidth())) -+ self.batchcombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.batchcombo.sizePolicy().hasHeightForWidth())) - self.batchcombo.setInsertionPolicy(QComboBox.NoInsertion) - self.batchcombo.setAutoCompletion(1) - self.batchcombo.setDuplicatesEnabled(0) - batchgroupLayout.addWidget(self.batchcombo) - - self.batchedbtn = QPushButton(self.batchgroup,"batchedbtn") -- self.batchedbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) -+ self.batchedbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) - self.batchedbtn.setPixmap(self.image0) - batchgroupLayout.addWidget(self.batchedbtn) - buttonGroup5Layout.addWidget(self.batchgroup) ---- imgSeekLib/AlbumForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/AlbumForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -284,13 +284,13 @@ - page1Layout = QGridLayout(self.page1,1,1,2,4,"page1Layout") - - self.batchedbtn = QPushButton(self.page1,"batchedbtn") -- self.batchedbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) -+ self.batchedbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.batchedbtn.sizePolicy().hasHeightForWidth())) - self.batchedbtn.setPixmap(self.image0) - - page1Layout.addWidget(self.batchedbtn,0,2) - - self.batchcombo = QComboBox(0,self.page1,"batchcombo") -- self.batchcombo.setSizePolicy(QSizePolicy(7,0,0,0,self.batchcombo.sizePolicy().hasHeightForWidth())) -+ self.batchcombo.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.batchcombo.sizePolicy().hasHeightForWidth())) - self.batchcombo.setInsertionPolicy(QComboBox.NoInsertion) - self.batchcombo.setAutoCompletion(1) - self.batchcombo.setDuplicatesEnabled(0) -@@ -307,7 +307,7 @@ - page1Layout.addMultiCellWidget(self.textLabel2_2,1,1,0,2) - - self.textLabel2 = QLabel(self.page1,"textLabel2") -- self.textLabel2.setSizePolicy(QSizePolicy(1,5,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Preferred,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) - - page1Layout.addWidget(self.textLabel2,0,0) - -@@ -341,12 +341,12 @@ - layout15 = QVBoxLayout(None,0,6,"layout15") - - self.addinfothumbbtn = QPushButton(self.groupBox4,"addinfothumbbtn") -- self.addinfothumbbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.addinfothumbbtn.sizePolicy().hasHeightForWidth())) -+ self.addinfothumbbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.addinfothumbbtn.sizePolicy().hasHeightForWidth())) - self.addinfothumbbtn.setPixmap(self.image1) - layout15.addWidget(self.addinfothumbbtn) - - self.delinfothumbbtn = QPushButton(self.groupBox4,"delinfothumbbtn") -- self.delinfothumbbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.delinfothumbbtn.sizePolicy().hasHeightForWidth())) -+ self.delinfothumbbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.delinfothumbbtn.sizePolicy().hasHeightForWidth())) - self.delinfothumbbtn.setPixmap(self.image2) - layout15.addWidget(self.delinfothumbbtn) - groupBox4Layout.addLayout(layout15) -@@ -374,7 +374,7 @@ - groupBox14Layout.setAlignment(Qt.AlignTop) - - self.textLabel5 = QLabel(self.groupBox14,"textLabel5") -- self.textLabel5.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel5.sizePolicy().hasHeightForWidth())) -+ self.textLabel5.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel5.sizePolicy().hasHeightForWidth())) - - groupBox14Layout.addWidget(self.textLabel5,0,0) - -@@ -383,7 +383,7 @@ - groupBox14Layout.addMultiCellWidget(self.themecomboBox,0,0,1,2) - - self.textLabel2_3 = QLabel(self.groupBox14,"textLabel2_3") -- self.textLabel2_3.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) -+ self.textLabel2_3.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel2_3.sizePolicy().hasHeightForWidth())) - - groupBox14Layout.addMultiCellWidget(self.textLabel2_3,1,1,0,1) - -@@ -405,7 +405,7 @@ - buttonGroup2_2Layout.setAlignment(Qt.AlignTop) - - self.inplaceradio = QRadioButton(self.buttonGroup2_2,"inplaceradio") -- self.inplaceradio.setSizePolicy(QSizePolicy(0,0,0,0,self.inplaceradio.sizePolicy().hasHeightForWidth())) -+ self.inplaceradio.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.inplaceradio.sizePolicy().hasHeightForWidth())) - - buttonGroup2_2Layout.addMultiCellWidget(self.inplaceradio,0,0,0,1) - -@@ -419,7 +419,7 @@ - buttonGroup2_2Layout.addWidget(self.destdirEdit,2,1) - - self.textLabel11 = QLabel(self.buttonGroup2_2,"textLabel11") -- self.textLabel11.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel11.sizePolicy().hasHeightForWidth())) -+ self.textLabel11.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel11.sizePolicy().hasHeightForWidth())) - - buttonGroup2_2Layout.addWidget(self.textLabel11,2,0) - -@@ -436,7 +436,7 @@ - groupBox15Layout.setAlignment(Qt.AlignTop) - - self.textLabel1 = QLabel(self.groupBox15,"textLabel1") -- self.textLabel1.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) -+ self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) - - groupBox15Layout.addWidget(self.textLabel1,0,0) - ---- imgSeekLib/CSVImportForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/CSVImportForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -33,7 +33,7 @@ - groupBox5Layout.addWidget(self.pathedit) - - self.morebtn = QPushButton(self.groupBox5,"morebtn") -- self.morebtn.setSizePolicy(QSizePolicy(0,0,0,0,self.morebtn.sizePolicy().hasHeightForWidth())) -+ self.morebtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.morebtn.sizePolicy().hasHeightForWidth())) - groupBox5Layout.addWidget(self.morebtn) - - CSVImportFormLayout.addMultiCellWidget(self.groupBox5,0,0,0,1) ---- imgSeekLib/MetaForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/MetaForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -601,7 +601,7 @@ - metaformLayout.addMultiCellWidget(self.tableMeta,3,3,0,2) - - self.thumbLabel = QLabel(self,"thumbLabel") -- self.thumbLabel.setSizePolicy(QSizePolicy(0,0,0,0,self.thumbLabel.sizePolicy().hasHeightForWidth())) -+ self.thumbLabel.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.thumbLabel.sizePolicy().hasHeightForWidth())) - self.thumbLabel.setMinimumSize(QSize(128,128)) - self.thumbLabel.setMaximumSize(QSize(128,128)) - self.thumbLabel.setFrameShape(QLabel.NoFrame) -@@ -611,32 +611,32 @@ - metaformLayout.addMultiCellWidget(self.thumbLabel,0,2,0,0) - - self.textLabel2 = QLabel(self,"textLabel2") -- self.textLabel2.setSizePolicy(QSizePolicy(5,0,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Fixed,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) - self.textLabel2.setAlignment(QLabel.WordBreak | QLabel.AlignVCenter) - - metaformLayout.addMultiCellWidget(self.textLabel2,0,0,1,2) - - self.targettab = QTabWidget(self,"targettab") -- self.targettab.setSizePolicy(QSizePolicy(7,0,0,0,self.targettab.sizePolicy().hasHeightForWidth())) -+ self.targettab.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.targettab.sizePolicy().hasHeightForWidth())) - - self.tab = QWidget(self.targettab,"tab") - tabLayout = QGridLayout(self.tab,1,1,0,4,"tabLayout") - - self.previousBtn = QPushButton(self.tab,"previousBtn") -- self.previousBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.previousBtn.sizePolicy().hasHeightForWidth())) -+ self.previousBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.previousBtn.sizePolicy().hasHeightForWidth())) - self.previousBtn.setPixmap(self.image0) - - tabLayout.addWidget(self.previousBtn,0,0) - - self.nextButton = QPushButton(self.tab,"nextButton") -- self.nextButton.setSizePolicy(QSizePolicy(0,0,0,0,self.nextButton.sizePolicy().hasHeightForWidth())) -+ self.nextButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.nextButton.sizePolicy().hasHeightForWidth())) - self.nextButton.setPixmap(self.image1) - self.nextButton.setDefault(1) - - tabLayout.addWidget(self.nextButton,0,1) - - self.indexLabel = QLabel(self.tab,"indexLabel") -- self.indexLabel.setSizePolicy(QSizePolicy(1,0,0,0,self.indexLabel.sizePolicy().hasHeightForWidth())) -+ self.indexLabel.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.indexLabel.sizePolicy().hasHeightForWidth())) - self.indexLabel.setFrameShape(QLabel.Panel) - - tabLayout.addWidget(self.indexLabel,0,3) -@@ -652,7 +652,7 @@ - tabLayout_2.addWidget(self.batchcombo,0,0) - - self.showbatcheditor = QPushButton(self.tab_2,"showbatcheditor") -- self.showbatcheditor.setSizePolicy(QSizePolicy(0,0,0,0,self.showbatcheditor.sizePolicy().hasHeightForWidth())) -+ self.showbatcheditor.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.showbatcheditor.sizePolicy().hasHeightForWidth())) - self.showbatcheditor.setPixmap(self.image2) - - tabLayout_2.addWidget(self.showbatcheditor,0,1) -@@ -661,14 +661,14 @@ - metaformLayout.addMultiCellWidget(self.targettab,1,2,1,1) - - self.ApplyBtn = QPushButton(self,"ApplyBtn") -- self.ApplyBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.ApplyBtn.sizePolicy().hasHeightForWidth())) -+ self.ApplyBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.ApplyBtn.sizePolicy().hasHeightForWidth())) - self.ApplyBtn.setPixmap(self.image3) - self.ApplyBtn.setDefault(1) - - metaformLayout.addWidget(self.ApplyBtn,1,2) - - self.refreshbtn = QPushButton(self,"refreshbtn") -- self.refreshbtn.setSizePolicy(QSizePolicy(0,0,0,0,self.refreshbtn.sizePolicy().hasHeightForWidth())) -+ self.refreshbtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.refreshbtn.sizePolicy().hasHeightForWidth())) - self.refreshbtn.setPixmap(self.image4) - - metaformLayout.addWidget(self.refreshbtn,2,2) ---- imgSeekLib/TransformForm.py.orig 2005-02-22 21:17:05.000000000 +0100 -+++ imgSeekLib/TransformForm.py 2005-02-22 21:17:06.000000000 +0100 -@@ -302,7 +302,7 @@ - if not name: - self.setName("TransformForm") - -- self.setSizePolicy(QSizePolicy(1,1,0,0,self.sizePolicy().hasHeightForWidth())) -+ self.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.sizePolicy().hasHeightForWidth())) - self.setIcon(self.image0) - - TransformFormLayout = QVBoxLayout(self,3,0,"TransformFormLayout") -@@ -310,33 +310,33 @@ - layout20 = QGridLayout(None,1,1,0,6,"layout20") - - self.ApplyBtn = QPushButton(self,"ApplyBtn") -- self.ApplyBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.ApplyBtn.sizePolicy().hasHeightForWidth())) -+ self.ApplyBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.ApplyBtn.sizePolicy().hasHeightForWidth())) - self.ApplyBtn.setPixmap(self.image0) - self.ApplyBtn.setDefault(1) - - layout20.addWidget(self.ApplyBtn,0,1) - - self.targettab = QTabWidget(self,"targettab") -- self.targettab.setSizePolicy(QSizePolicy(7,0,0,0,self.targettab.sizePolicy().hasHeightForWidth())) -+ self.targettab.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Fixed,0,0,self.targettab.sizePolicy().hasHeightForWidth())) - - self.tab = QWidget(self.targettab,"tab") - tabLayout = QGridLayout(self.tab,1,1,0,3,"tabLayout") - - self.previousBtn = QPushButton(self.tab,"previousBtn") -- self.previousBtn.setSizePolicy(QSizePolicy(0,0,0,0,self.previousBtn.sizePolicy().hasHeightForWidth())) -+ self.previousBtn.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.previousBtn.sizePolicy().hasHeightForWidth())) - self.previousBtn.setPixmap(self.image1) - - tabLayout.addWidget(self.previousBtn,0,0) - - self.nextButton = QPushButton(self.tab,"nextButton") -- self.nextButton.setSizePolicy(QSizePolicy(0,0,0,0,self.nextButton.sizePolicy().hasHeightForWidth())) -+ self.nextButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.nextButton.sizePolicy().hasHeightForWidth())) - self.nextButton.setPixmap(self.image2) - self.nextButton.setDefault(1) - - tabLayout.addWidget(self.nextButton,0,1) - - self.indexLabel = QLabel(self.tab,"indexLabel") -- self.indexLabel.setSizePolicy(QSizePolicy(1,0,0,0,self.indexLabel.sizePolicy().hasHeightForWidth())) -+ self.indexLabel.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.indexLabel.sizePolicy().hasHeightForWidth())) - - tabLayout.addWidget(self.indexLabel,0,2) - spacer7 = QSpacerItem(220,20,QSizePolicy.Expanding,QSizePolicy.Minimum) -@@ -353,7 +353,7 @@ - tabLayout_2.addWidget(self.batchcombo,0,0) - - self.showbatcheditor = QPushButton(self.tab_2,"showbatcheditor") -- self.showbatcheditor.setSizePolicy(QSizePolicy(0,0,0,0,self.showbatcheditor.sizePolicy().hasHeightForWidth())) -+ self.showbatcheditor.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.showbatcheditor.sizePolicy().hasHeightForWidth())) - self.showbatcheditor.setPixmap(self.image3) - - tabLayout_2.addWidget(self.showbatcheditor,0,1) -@@ -365,11 +365,11 @@ - layout19 = QHBoxLayout(None,0,6,"layout19") - - self.textLabel2 = QLabel(self,"textLabel2") -- self.textLabel2.setSizePolicy(QSizePolicy(0,0,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) -+ self.textLabel2.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.textLabel2.sizePolicy().hasHeightForWidth())) - layout19.addWidget(self.textLabel2) - - self.transfCombo = QComboBox(0,self,"transfCombo") -- self.transfCombo.setSizePolicy(QSizePolicy(1,0,0,0,self.transfCombo.sizePolicy().hasHeightForWidth())) -+ self.transfCombo.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.transfCombo.sizePolicy().hasHeightForWidth())) - self.transfCombo.setInsertionPolicy(QComboBox.NoInsertion) - self.transfCombo.setAutoCompletion(1) - layout19.addWidget(self.transfCombo) -@@ -380,7 +380,7 @@ - layout24.addItem(spacer13) - - self.thumbLabel = QLabel(self,"thumbLabel") -- self.thumbLabel.setSizePolicy(QSizePolicy(0,0,0,0,self.thumbLabel.sizePolicy().hasHeightForWidth())) -+ self.thumbLabel.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.thumbLabel.sizePolicy().hasHeightForWidth())) - self.thumbLabel.setMinimumSize(QSize(128,128)) - self.thumbLabel.setMaximumSize(QSize(128,128)) - self.thumbLabel.setScaledContents(0) -@@ -404,7 +404,7 @@ - layout25.addWidget(self.slider1) - - self.value1Edit = QLineEdit(self,"value1Edit") -- self.value1Edit.setSizePolicy(QSizePolicy(0,0,0,0,self.value1Edit.sizePolicy().hasHeightForWidth())) -+ self.value1Edit.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.value1Edit.sizePolicy().hasHeightForWidth())) - self.value1Edit.setMaximumSize(QSize(40,32767)) - layout25.addWidget(self.value1Edit) - layout23.addLayout(layout25) -@@ -422,7 +422,7 @@ - layout24_2.addWidget(self.slider2) - - self.value2Edit = QLineEdit(self,"value2Edit") -- self.value2Edit.setSizePolicy(QSizePolicy(0,0,0,0,self.value2Edit.sizePolicy().hasHeightForWidth())) -+ self.value2Edit.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.value2Edit.sizePolicy().hasHeightForWidth())) - self.value2Edit.setMaximumSize(QSize(40,32767)) - layout24_2.addWidget(self.value2Edit) - layout23.addLayout(layout24_2) -@@ -440,7 +440,7 @@ - layout23_2.addWidget(self.slider3) - - self.value3Edit = QLineEdit(self,"value3Edit") -- self.value3Edit.setSizePolicy(QSizePolicy(0,0,0,0,self.value3Edit.sizePolicy().hasHeightForWidth())) -+ self.value3Edit.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.value3Edit.sizePolicy().hasHeightForWidth())) - self.value3Edit.setMaximumSize(QSize(40,32767)) - layout23_2.addWidget(self.value3Edit) - layout23.addLayout(layout23_2) -@@ -448,7 +448,7 @@ - layout18 = QHBoxLayout(None,0,6,"layout18") - - self.textLabel1 = QLabel(self,"textLabel1") -- self.textLabel1.setSizePolicy(QSizePolicy(0,5,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) -+ self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Preferred,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) - layout18.addWidget(self.textLabel1) - - self.lineEdit1 = QLineEdit(self,"lineEdit1") diff --git a/media-gfx/imgseek/imgseek-0.8.4.ebuild b/media-gfx/imgseek/imgseek-0.8.4.ebuild index bf4df021dc43..4d24762327d0 100644 --- a/media-gfx/imgseek/imgseek-0.8.4.ebuild +++ b/media-gfx/imgseek/imgseek-0.8.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.4.ebuild,v 1.1 2005/02/22 21:05:17 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.4.ebuild,v 1.2 2005/03/06 15:53:41 carlo Exp $ inherit eutils @@ -8,7 +8,8 @@ MY_P="imgSeek-${PV}" S="${WORKDIR}/${MY_P}" DESCRIPTION="Photo collection manager with content-based search." HOMEPAGE="http://imgseek.sourceforge.net/" -SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2" +SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2 + http://dev.gentoo.org/~carlo/patches/${MY_P}-sizetype.patch.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" @@ -21,7 +22,7 @@ DEPEND=">=dev-lang/python-2.2 src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${MY_P}-sizetype.patch + epatch ${WORKDIR}/${MY_P}-sizetype.patch } src_compile() { |