[kde-edu]: [edit]

Anne-Marie Mahfouf annemarie.mahfouf at free.fr
Fri Dec 28 17:38:16 CET 2007


Hi,

I cannot apply the patch, can you do
svn diff > ktouch.patch
against current svn and attach this file please (instead of including inline)?
Thanks in advance!

Anne-Marie

Le Thursday 27 December 2007 03:12:37 pm Arnaud Dupuis, vous avez écrit :
> [KTouch] patch - "Edit Keyboard Layout" Dialog
> MIME-Version: 1.0
> Content-Type: multipart/mixed;
> 	boundary="----=_Part_3992_20520813.1198786357569"
> X-Originating-IP: [192.168.31.254]
>
> ------=_Part_3992_20520813.1198786357569
> Content-Type: text/plain; charset=utf-8
> Content-Transfer-Encoding: 7bit
>
> Greetings,
>
> Following the junior job on KTouch
> (http://wiki.30doradus.org/index.php/KDE-Edu_Junior_Jobs_for_KDE_4), i
> modified the ui of the "Edit Keyboard Layout" Dialog and made it fit a
> 1280x800 window. I tested it localized in English and in French and with
> the larger one (local: French) I got the following xwininfo :
>
> xwininfo: Window id: 0xa009d5 "KTouch Keyboard Editor -
> file:///home/kde-devel/kde/share/apps/ktouch/fr.keyboard.xml"
>
>   Absolute upper-left X:  5
>   Absolute upper-left Y:  80
>   Relative upper-left X:  0
>   Relative upper-left Y:  0
>   Width: 1209
>   Height: 628
>   Depth: 24
>   Visual Class: TrueColor
>   Border width: 0
>   Class: InputOutput
>   Colormap: 0x20 (installed)
>   Bit Gravity State: NorthWestGravity
>   Window Gravity State: NorthWestGravity
>   Backing Store State: NotUseful
>   Save Under State: no
>   Map State: IsViewable
>   Override Redirect State: no
>   Corners:  +5+80  -466+80  -466-342  +5-342
>   -geometry 1209x628+0+55
>
> I hope this will help a little. You can join me on IRC under the nickname
> Arno[Slack] on #kde and #kde-edu. You can also send mail at
> a.dupuis at infinityperl.org if you prefer (this is my professional email).
>
> The patch is just a svn diff (to the head) of the repository (revision:
> 753355).
>
> Best regards,
>
> Arnaud Dupuis
> Consultant
> Uperto (Open Source Business Unit)
> Devoteam group
>
> ------=_Part_3992_20520813.1198786357569
> Content-Type: application/octet-stream;
> 	name=ktouch_edit_keyboard_layout_dialog.patch
> Content-Transfer-Encoding: 7bit
> Content-Disposition: attachment;
> 	filename=ktouch_edit_keyboard_layout_dialog.patch
>
> Index: src/ui/ktouchkeyboardeditordialog.ui
> ===================================================================
> --- src/ui/ktouchkeyboardeditordialog.ui	(revision 753355)
> +++ src/ui/ktouchkeyboardeditordialog.ui	(working copy)
> @@ -5,8 +5,8 @@
>     <rect>
>      <x>0</x>
>      <y>0</y>
> -    <width>786</width>
> -    <height>651</height>
> +    <width>730</width>
> +    <height>623</height>
>     </rect>
>    </property>
>    <property name="windowTitle" >
> @@ -27,27 +27,27 @@
>       <property name="title" >
>        <string>Keyboard Identification Data</string>
>       </property>
> -     <layout class="QVBoxLayout" >
> -      <item>
> -       <layout class="QGridLayout" >
> -        <item row="0" column="0" >
> +     <layout class="QGridLayout" >
> +      <item row="0" column="0" >
> +       <layout class="QVBoxLayout" >
> +        <item>
>           <widget class="QLabel" name="titleLabel" >
>            <property name="text" >
>             <string>Keyboard title:</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="0" column="1" >
> +        <item>
>           <widget class="QLineEdit" name="titleEdit" />
>          </item>
> -        <item row="1" column="0" >
> +        <item>
>           <widget class="QLabel" name="textLabel2" >
>            <property name="text" >
>             <string>Language id:</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="1" column="1" >
> +        <item>
>           <widget class="KComboBox" name="langIDCombo" >
>            <property name="editable" >
>             <bool>true</bool>
> @@ -56,7 +56,7 @@
>          </item>
>         </layout>
>        </item>
> -      <item>
> +      <item row="1" column="0" >
>         <widget class="QLabel" name="textLabel1" >
>          <property name="sizePolicy" >
>           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
> @@ -69,7 +69,7 @@
>          </property>
>         </widget>
>        </item>
> -      <item>
> +      <item row="2" column="0" >
>         <widget class="QTextEdit" name="commentEdit" >
>          <property name="sizePolicy" >
>           <sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
> @@ -93,32 +93,32 @@
>       <property name="title" >
>        <string>Key Properties</string>
>       </property>
> -     <layout class="QVBoxLayout" >
> -      <item>
> -       <layout class="QGridLayout" >
> -        <item row="0" column="0" >
> +     <layout class="QGridLayout" >
> +      <item row="0" column="0" >
> +       <layout class="QVBoxLayout" >
> +        <item>
>           <widget class="QLabel" name="label_6" >
>            <property name="text" >
>             <string>Key type:</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="0" column="1" >
> +        <item>
>           <widget class="QComboBox" name="keyTypeCombo" />
>          </item>
> -        <item row="1" column="0" >
> +        <item>
>           <widget class="QLabel" name="keyTextLabel" >
>            <property name="text" >
>             <string>Key text:</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="1" column="1" >
> +        <item>
>           <widget class="QLineEdit" name="keyTextEdit" />
>          </item>
>         </layout>
>        </item>
> -      <item>
> +      <item row="1" column="0" >
>         <layout class="QGridLayout" >
>          <item row="0" column="0" colspan="2" >
>           <widget class="QLabel" name="keyCharLabel" >
> @@ -233,7 +233,7 @@
>          </item>
>         </layout>
>        </item>
> -      <item>
> +      <item row="2" column="0" colspan="2" >
>         <spacer>
>          <property name="orientation" >
>           <enum>Qt::Vertical</enum>
> @@ -249,7 +249,7 @@
>          </property>
>         </spacer>
>        </item>
> -      <item>
> +      <item row="3" column="0" colspan="2" >
>         <layout class="QHBoxLayout" >
>          <item>
>           <widget class="KPushButton" name="selectFingerKeyButton" >
> @@ -284,54 +284,38 @@
>       <property name="title" >
>        <string>Keyboard Edit Options</string>
>       </property>
> -     <layout class="QVBoxLayout" >
> -      <item>
> -       <layout class="QGridLayout" >
> -        <item row="0" column="0" >
> +     <layout class="QGridLayout" >
> +      <item row="0" column="0" >
> +       <layout class="QVBoxLayout" >
> +        <item>
>           <widget class="QPushButton" name="openButton" >
>            <property name="text" >
>             <string>Open Keyboard...</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="0" column="1" >
> +        <item>
>           <widget class="QPushButton" name="setFontButton" >
>            <property name="text" >
>             <string>Set Keyboard Font...</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="1" column="0" >
> +        <item>
>           <widget class="QPushButton" name="saveButton" >
>            <property name="text" >
>             <string>Save Keyboard</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="1" column="1" >
> -         <spacer>
> -          <property name="orientation" >
> -           <enum>Qt::Vertical</enum>
> -          </property>
> -          <property name="sizeType" >
> -           <enum>QSizePolicy::Minimum</enum>
> -          </property>
> -          <property name="sizeHint" >
> -           <size>
> -            <width>20</width>
> -            <height>20</height>
> -           </size>
> -          </property>
> -         </spacer>
> -        </item>
> -        <item row="2" column="0" >
> +        <item>
>           <widget class="QPushButton" name="saveAsButton" >
>            <property name="text" >
>             <string>Save Keyboard As...</string>
>            </property>
>           </widget>
>          </item>
> -        <item row="2" column="1" >
> +        <item>
>           <widget class="QPushButton" name="closeButton" >
>            <property name="text" >
>             <string>Close</string>
> @@ -340,19 +324,6 @@
>          </item>
>         </layout>
>        </item>
> -      <item>
> -       <spacer>
> -        <property name="orientation" >
> -         <enum>Qt::Vertical</enum>
> -        </property>
> -        <property name="sizeHint" >
> -         <size>
> -          <width>20</width>
> -          <height>40</height>
> -         </size>
> -        </property>
> -       </spacer>
> -      </item>
>       </layout>
>      </widget>
>     </item>
> @@ -408,19 +379,6 @@
>          </property>
>         </widget>
>        </item>
> -      <item row="0" column="4" >
> -       <spacer>
> -        <property name="orientation" >
> -         <enum>Qt::Horizontal</enum>
> -        </property>
> -        <property name="sizeHint" >
> -         <size>
> -          <width>40</width>
> -          <height>20</height>
> -         </size>
> -        </property>
> -       </spacer>
> -      </item>
>        <item row="1" column="0" >
>         <widget class="QLabel" name="label_7" >
>          <property name="text" >
> @@ -467,19 +425,6 @@
>          </property>
>         </widget>
>        </item>
> -      <item row="2" column="1" >
> -       <spacer>
> -        <property name="orientation" >
> -         <enum>Qt::Vertical</enum>
> -        </property>
> -        <property name="sizeHint" >
> -         <size>
> -          <width>20</width>
> -          <height>40</height>
> -         </size>
> -        </property>
> -       </spacer>
> -      </item>
>       </layout>
>      </widget>
>     </item>
>
> ------=_Part_3992_20520813.1198786357569--
>
> _______________________________________________
> kde-edu mailing list
> kde-edu at mail.kde.org
> https://mail.kde.org/mailman/listinfo/kde-edu





More information about the kde-edu mailing list