[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: update to audiocd kioslave.
From:       Johannes Christenson <mrchristenson () gmail ! com>
Date:       2010-04-27 7:29:40
Message-ID: 201004270929.40739.MrChristenson () gmail ! com
[Download RAW message or body]

On Sunday 25 April 2010 16.29.17 Albert Astals Cid wrote:
> A Divendres, 23 d'abril de 2010, Albert Astals Cid va escriure:
> > A Divendres, 23 d'abril de 2010, Johannes Christenson va escriure:
> > > On Thursday 22 April 2010 19.55.47 Albert Astals Cid wrote:
> > > > A Dijous, 22 d'abril de 2010, Johannes Christenson va escriure:
> > > > > Could someone please help me with this?
> > > > 
> > > > It's on my list, just that i've a long list, i'll probably get to it
> > > > in the weekend, if anyone else wants to take it, i'll be happy :D
> > > > 
> > > > Albert
> > > > 
> > > > >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to
> > > > >> unsubscribe <<
> > > 
> > > Sorry if I'm pushing. It's just that feature freeze is on Monday and I
> > > was hoping to get it into 4.5.
> > 
> > We can always consider it a bug fix, but as said, i'll get to it in the
> > weekend ;-)
> 
> I had a look at your patch and did not like how you reused the album name
> to create the hierarrchy. So i've commmited a patch heavily inspired by
> yours that uses a different setting to decided how the hierarchy should be
> named.
> 
> Please test it and see if it feeds your needs.
I've found  two small errors/annoyances in the GUI and a patch for those are 
attached (fixlineupandnameclashincdaudioconfigui.diff).

Also as much as I think your patch is great (and superior to mine) I find the 
number of times that the macro expansion is explained in the GUI not so great 
and created a patch which changes that. 
(suggestedreorganizationofcdaudioconfigui.diff)
I should note that I don't think my solution here is perfected in any way and 
your much welcome to change it (or dismiss it). All to your preference.

Johannes

P.S. Since I still haven't figured out a good way to create a two step patch 
the second patch includes the changes of the first patch also.
> 
> Albert
> 
> > Albert
> > 
> > > Johannes
> > > 
> > > >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to
> > > >> unsubscribe <<
> > >> 
> > >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to
> > >> unsubscribe <<

["fixlineupandnameclashincdaudioconfigui.diff" (text/x-patch)]

Index: kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
===================================================================
--- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui	(revision 1119435)
+++ kioslave/audiocd/kcmaudiocd/audiocdconfig.ui	(working copy)
@@ -22,7 +22,7 @@
      <property name="currentIndex">
       <number>1</number>
      </property>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tabGeneral">
       <attribute name="title">
        <string>&amp;General</string>
       </attribute>
@@ -171,7 +171,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tabNames">
       <attribute name="title">
        <string>&amp;Names</string>
       </attribute>
@@ -360,7 +360,7 @@
           </item>
           <item>
            <layout class="QGridLayout">
-            <item row="2" column="1" rowspan="2">
+            <item row="2" column="1">
              <widget class="QLabel" name="textLabel20">
               <property name="text">
                <string>Year</string>
@@ -370,7 +370,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0" rowspan="2">
+            <item row="1" column="0">
              <widget class="QLabel" name="textLabel15">
               <property name="text">
                <string>%{albumartist}</string>
@@ -380,7 +380,7 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
+            <item row="2" column="0">
              <widget class="QLabel" name="textLabel16">
               <property name="text">
                <string>%{year}</string>
@@ -390,7 +390,7 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
+            <item row="3" column="1">
              <widget class="QLabel" name="textLabel21">
               <property name="text">
                <string>Genre</string>
@@ -420,7 +420,7 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
+            <item row="3" column="0">
              <widget class="QLabel" name="textLabel17">
               <property name="text">
                <string>%{genre}</string>
@@ -491,7 +491,7 @@
           </item>
           <item>
            <layout class="QGridLayout" name="_3">
-            <item row="2" column="1" rowspan="2">
+            <item row="2" column="1">
              <widget class="QLabel" name="textLabel20_2">
               <property name="text">
                <string>Year</string>
@@ -501,7 +501,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0" rowspan="2">
+            <item row="1" column="0">
              <widget class="QLabel" name="textLabel15_2">
               <property name="text">
                <string>%{albumartist}</string>
@@ -511,7 +511,7 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
+            <item row="2" column="0">
              <widget class="QLabel" name="textLabel16_2">
               <property name="text">
                <string>%{year}</string>
@@ -521,7 +521,7 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
+            <item row="3" column="1">
              <widget class="QLabel" name="textLabel21_2">
               <property name="text">
                <string>Genre</string>
@@ -551,7 +551,7 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
+            <item row="3" column="0">
              <widget class="QLabel" name="textLabel17_2">
               <property name="text">
                <string>%{genre}</string>

["suggestedreorganizationofcdaudioconfigui.diff" (text/x-patch)]

Index: kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
===================================================================
--- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui	(revision 1119435)
+++ kioslave/audiocd/kcmaudiocd/audiocdconfig.ui	(working copy)
@@ -22,7 +22,7 @@
      <property name="currentIndex">
       <number>1</number>
      </property>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tabGeneral">
       <attribute name="title">
        <string>&amp;General</string>
       </attribute>
@@ -171,7 +171,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tabNames">
       <attribute name="title">
        <string>&amp;Names</string>
       </attribute>
@@ -336,9 +336,25 @@
             </item>
            </layout>
           </item>
-          <item row="2" column="0">
+          <item row="3" column="0">
            <widget class="KLineEdit" name="fileNameLineEdit"/>
           </item>
+          <item row="2" column="0">
+           <spacer name="spacer3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>10</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -360,7 +376,7 @@
           </item>
           <item>
            <layout class="QGridLayout">
-            <item row="2" column="1" rowspan="2">
+            <item row="2" column="1">
              <widget class="QLabel" name="textLabel20">
               <property name="text">
                <string>Year</string>
@@ -370,7 +386,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0" rowspan="2">
+            <item row="1" column="0">
              <widget class="QLabel" name="textLabel15">
               <property name="text">
                <string>%{albumartist}</string>
@@ -380,7 +396,7 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
+            <item row="2" column="0">
              <widget class="QLabel" name="textLabel16">
               <property name="text">
                <string>%{year}</string>
@@ -390,7 +406,7 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
+            <item row="3" column="1">
              <widget class="QLabel" name="textLabel21">
               <property name="text">
                <string>Genre</string>
@@ -420,7 +436,7 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
+            <item row="3" column="0">
              <widget class="QLabel" name="textLabel17">
               <property name="text">
                <string>%{genre}</string>
@@ -443,157 +459,31 @@
            </layout>
           </item>
           <item>
-           <spacer name="spacer3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>31</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
            <widget class="KLineEdit" name="albumNameLineEdit"/>
           </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QGroupBox" name="fileLocationGroupBox">
-         <property name="whatsThis">
-          <string>This defines where files will appear in relation to the encoder \
root, you can use / to create subdirectories. E.g: %{albumartist}/%{albumtitle} \
                </string>
-         </property>
-         <property name="title">
-          <string>Files Location</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="_2">
           <item>
-           <widget class="QLabel" name="fileNameLabel_3">
-            <property name="text">
-             <string>The following macros will be expanded:</string>
+           <widget class="QGroupBox" name="fileLocationGroupBox">
+            <property name="whatsThis">
+             <string>This defines where files will appear in relation to the encoder \
root, you can use / to create subdirectories. E.g: %{albumartist}/%{albumtitle} \
</string>  </property>
-            <property name="wordWrap">
-             <bool>false</bool>
+            <property name="title">
+             <string>Files Location</string>
             </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QGridLayout" name="_3">
-            <item row="2" column="1" rowspan="2">
-             <widget class="QLabel" name="textLabel20_2">
-              <property name="text">
-               <string>Year</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0" rowspan="2">
-             <widget class="QLabel" name="textLabel15_2">
-              <property name="text">
-               <string>%{albumartist}</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="textLabel16_2">
-              <property name="text">
-               <string>%{year}</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
-             <widget class="QLabel" name="textLabel21_2">
-              <property name="text">
-               <string>Genre</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QLabel" name="textLabel19_2">
-              <property name="text">
-               <string>Album Artist</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="textLabel18_2">
-              <property name="text">
-               <string>Album Title</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="textLabel17_2">
-              <property name="text">
-               <string>%{genre}</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="textLabel14_2">
-              <property name="text">
-               <string>%{albumtitle}</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <spacer name="spacer3_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
+            <property name="checkable">
+             <bool>true</bool>
             </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
+            <property name="checked">
+             <bool>false</bool>
             </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>31</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="KLineEdit" name="fileLocationLineEdit">
-            <property name="text">
-             <string>%{albumtitle}/%{albumartist}</string>
-            </property>
+            <layout class="QVBoxLayout" name="_2">
+             <item>
+              <widget class="KLineEdit" name="fileLocationLineEdit">
+               <property name="text">
+                <string>%{albumtitle}/%{albumartist}</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </widget>
           </item>
          </layout>



>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic