[Debichem-commits] [SCM] massXpert mass spectrometry suite: debian packaging branch, upstream, updated. upstream/2.4.4

Filippo Rusconi (Debian Maintainer) rusconi-debian at laposte.net
Fri May 6 12:42:23 UTC 2011


The following commit has been merged in the upstream branch:
commit ead59659fe54398c1811282f468a19cb6cec0f1c
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Tue May 3 23:58:21 2011 +0200

    Fixes in ui files (widget name already used).

diff --git a/gui/ui/atomDefDlg.ui b/gui/ui/atomDefDlg.ui
index e8a73ee..7d110ed 100644
--- a/gui/ui/atomDefDlg.ui
+++ b/gui/ui/atomDefDlg.ui
@@ -23,7 +23,7 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QWidget" name="layoutWidget">
+     <widget class="QWidget" name="layoutWidget_1">
       <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="atomGroupBox">
@@ -116,7 +116,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="layoutWidget">
+     <widget class="QWidget" name="layoutWidget_2">
       <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="detailsGroupBox">
diff --git a/gui/ui/cleaveSpecDefDlg.ui b/gui/ui/cleaveSpecDefDlg.ui
index e621428..5679cb6 100644
--- a/gui/ui/cleaveSpecDefDlg.ui
+++ b/gui/ui/cleaveSpecDefDlg.ui
@@ -18,7 +18,7 @@
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget" name="layoutWidget_1" >
       <layout class="QGridLayout" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="cleaveSpecGroupBox" >
@@ -111,7 +111,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget" name="layoutWidget_2" >
       <layout class="QGridLayout" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="detailsGroupBox" >
diff --git a/gui/ui/crossLinkerDefDlg.ui b/gui/ui/crossLinkerDefDlg.ui
index a4a6b84..8a21950 100644
--- a/gui/ui/crossLinkerDefDlg.ui
+++ b/gui/ui/crossLinkerDefDlg.ui
@@ -22,7 +22,7 @@
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget" name="layoutWidget_1" >
       <layout class="QGridLayout" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="cleaveSpecGroupBox" >
@@ -115,7 +115,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget" name="layoutWidget_2" >
       <layout class="QGridLayout" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="detailsGroupBox" >
diff --git a/gui/ui/fragSpecDefDlg.ui b/gui/ui/fragSpecDefDlg.ui
index 39bc669..759284a 100644
--- a/gui/ui/fragSpecDefDlg.ui
+++ b/gui/ui/fragSpecDefDlg.ui
@@ -23,7 +23,7 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QWidget" name="layoutWidget">
+     <widget class="QWidget" name="layoutWidget_1">
       <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="fragSpecGroupBox">
@@ -116,7 +116,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="layoutWidget">
+     <widget class="QWidget" name="layoutWidget_2">
       <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="detailsGroupBox">
diff --git a/gui/ui/massSearchDlg.ui b/gui/ui/massSearchDlg.ui
index 6a8c5fa..ec60226 100644
--- a/gui/ui/massSearchDlg.ui
+++ b/gui/ui/massSearchDlg.ui
@@ -189,7 +189,7 @@
                 <property name="title" >
                  <string>Current selection</string>
                 </property>
-                <layout class="QGridLayout" name="gridLayout" >
+                <layout class="QGridLayout" name="gridLayout_1" >
                  <item row="0" column="0" >
                   <widget class="QLineEdit" name="currentSelectionLineEdit" >
                    <property name="readOnly" >
@@ -358,7 +358,7 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <widget class="QWidget" name="layoutWidget" >
+          <widget class="QWidget" name="layoutWidget_1" >
            <layout class="QVBoxLayout" >
             <item>
              <widget class="massXpert::MassSearchOligomerTreeView" name="monoOligomerTreeView" >
@@ -484,7 +484,7 @@
             </item>
            </layout>
           </widget>
-          <widget class="QWidget" name="layoutWidget" >
+          <widget class="QWidget" name="layoutWidget_2" >
            <layout class="QVBoxLayout" >
             <item>
              <widget class="massXpert::MassSearchOligomerTreeView" name="avgOligomerTreeView" >
diff --git a/gui/ui/monomerDefDlg.ui b/gui/ui/monomerDefDlg.ui
index 8b401b9..afdd98d 100644
--- a/gui/ui/monomerDefDlg.ui
+++ b/gui/ui/monomerDefDlg.ui
@@ -184,7 +184,7 @@
          <property name="title">
           <string>Calculate mass differences</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_1">
           <item row="0" column="0">
            <widget class="QLabel" name="label_3">
             <property name="text">
diff --git a/gui/ui/mzLabInputOligomerTreeViewDlg.ui b/gui/ui/mzLabInputOligomerTreeViewDlg.ui
index 2489f99..4430adc 100644
--- a/gui/ui/mzLabInputOligomerTreeViewDlg.ui
+++ b/gui/ui/mzLabInputOligomerTreeViewDlg.ui
@@ -39,7 +39,7 @@
      <property name="title" >
       <string>Mass type</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
+     <layout class="QGridLayout" name="gridLayout_1" >
       <item row="0" column="0" >
        <widget class="QRadioButton" name="monoRadioButton" >
         <property name="text" >
diff --git a/gui/ui/mzLabWnd.ui b/gui/ui/mzLabWnd.ui
index 1cc974d..f9885f3 100644
--- a/gui/ui/mzLabWnd.ui
+++ b/gui/ui/mzLabWnd.ui
@@ -28,7 +28,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <widget class="QWidget" name="layoutWidget">
+       <widget class="QWidget" name="layoutWidget_1">
         <layout class="QGridLayout" name="gridLayout_12">
          <item row="0" column="0">
           <widget class="QGroupBox" name="workingListsGroupBox">
@@ -125,7 +125,7 @@ in Catalogue 1 (Ctrl+D)</string>
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="layoutWidget">
+       <widget class="QWidget" name="layoutWidget_2">
         <layout class="QVBoxLayout" name="verticalLayout_6">
          <item>
           <widget class="QGroupBox" name="ionizationGroupBox">
diff --git a/gui/ui/sequenceEditorWnd.ui b/gui/ui/sequenceEditorWnd.ui
index 043cfd3..518a6b0 100644
--- a/gui/ui/sequenceEditorWnd.ui
+++ b/gui/ui/sequenceEditorWnd.ui
@@ -33,7 +33,7 @@
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="QWidget" name="layoutWidget">
+      <widget class="QWidget" name="layoutWidget_1">
        <layout class="QVBoxLayout">
         <property name="spacing">
          <number>6</number>
@@ -126,7 +126,7 @@
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <widget class="QWidget" name="layoutWidget">
+       <widget class="QWidget" name="layoutWidget_2">
         <layout class="QVBoxLayout">
          <item>
           <widget class="QGroupBox" name="massesOrMzGroupBox">
@@ -594,7 +594,7 @@
             <property name="title">
              <string>Selections and regions</string>
             </property>
-            <layout class="QGridLayout" name="gridLayout">
+            <layout class="QGridLayout" name="gridLayout_1">
              <item row="1" column="0">
               <widget class="QRadioButton" name="regionSelectionOligomerRadioButton">
                <property name="toolTip">

-- 
massXpert mass spectrometry suite: debian packaging



More information about the Debichem-commits mailing list