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

List:       kde-commits
Subject:    KDE/kdeedu/ktouch
From:       Andreas Nicolai <Andreas.Nicolai () gmx ! net>
Date:       2007-05-09 22:47:58
Message-ID: 1178750878.947147.18563.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 663062 by ghorwin:

Finished implementation of keyboard editor. Complete german keyboard layout file \
added.


 A             keyboards/de.keyboard.xml  
 M  +22 -7     src/ktouchkeyboardeditordialog.cpp  
 M  +17 -27    src/ui/ktouchkeyboardeditordialog.ui  


--- trunk/KDE/kdeedu/ktouch/src/ktouchkeyboardeditordialog.cpp #663061:663062
@@ -56,6 +56,14 @@
 		keyTypeCombo->addItem(KTouchKey::keyTypeString(static_cast<KTouchKey::keytype_t>(i)));
  }
 
+	// loop over all languages supported in KDE and add the language code and language \
name  +	// to the langIDCombo box
+	QStringList langlist = KGlobal::locale()->allLanguagesTwoAlpha();
+	for (int i=0; i<langlist.count(); ++i) {
+		QString langname = QString("%1 \
(%2)").arg(langlist[i]).arg(KGlobal::locale()->twoAlphaToLanguageName(langlist[i])); \
+		langIDCombo->addItem(langname); +	}
+
     connect(closeButton, SIGNAL(clicked()), this, SLOT(close()) );
 }
 // -----------------------------------------------------------------------------
@@ -89,9 +97,10 @@
 		m_keyboard->m_fontSuggestions = f.toString();
 		m_keyboard->setFont(f);
 		// update font
-		titleEdit->setFont(f);  
+/*		titleEdit->setFont(f);  
 		commentEdit->setFont(f);  
-		langIDEdit->setFont(f);  
+		langIDCombo->setFont(f);  
+*/
 		update();	// trigger repaint of the keyboard.
 		setModified();
     }
@@ -514,14 +523,20 @@
 		titleEdit->setText(m_keyboard->m_title);
 		commentEdit->setText(m_keyboard->m_comment);
 	}
-	langIDEdit->setText(m_keyboard->m_language);
-	if (!m_keyboard->m_fontSuggestions.isEmpty()) {
+	int index = langIDCombo->findText(m_keyboard->m_language);
+	if (index == -1) {
+		langIDCombo->addItem(m_keyboard->m_language);
+		index = langIDCombo->count()-1;
+	}
+	langIDCombo->setCurrentIndex(index);
+/*	if (!m_keyboard->m_fontSuggestions.isEmpty()) {
 		QFont f;
 		f.fromString(m_keyboard->m_fontSuggestions);
 		titleEdit->setFont(f);
 		commentEdit->setFont(f);
-		langIDEdit->setFont(f);
+		langIDCombo->setFont(f);
 	}
+*/
 	unsigned int min_x = 100000;
 	unsigned int max_x = 0;
 	unsigned int min_y = 100000;
@@ -542,13 +557,13 @@
 	QTimer::singleShot(10, this, SLOT(resizeKeyboard()));
 }
 // -----------------------------------------------------------------------------
-    
+
 void KTouchKeyboardEditorDialog::transfer_from_dialog() {
 	m_keyboard->m_title = titleEdit->text();
 	if (m_keyboard->m_title.isEmpty())  
 		m_keyboard->m_title = i18n("untitled keyboard layout");
 	m_keyboard->m_comment = commentEdit->toPlainText();
-	m_keyboard->m_language = langIDEdit->text();
+	m_keyboard->m_language = langIDCombo->currentText();
 }
 // -----------------------------------------------------------------------------
 
--- trunk/KDE/kdeedu/ktouch/src/ui/ktouchkeyboardeditordialog.ui #663061:663062
@@ -27,27 +27,9 @@
      <property name="title" >
       <string>Keyboard Identification Data</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
+     <layout class="QVBoxLayout" >
+      <item>
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>6</number>
-        </property>
-        <property name="verticalSpacing" >
-         <number>6</number>
-        </property>
         <item row="0" column="0" >
          <widget class="QLabel" name="titleLabel" >
           <property name="text" >
@@ -55,8 +37,8 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="langIDEdit" />
+        <item row="0" column="1" >
+         <widget class="QLineEdit" name="titleEdit" />
         </item>
         <item row="1" column="0" >
          <widget class="QLabel" name="textLabel2" >
@@ -65,12 +47,16 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="titleEdit" />
+        <item row="1" column="1" >
+         <widget class="KComboBox" name="langIDCombo" >
+          <property name="editable" >
+           <bool>true</bool>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
-      <item row="1" column="0" >
+      <item>
        <widget class="QLabel" name="textLabel1" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -83,7 +69,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item>
        <widget class="QTextEdit" name="commentEdit" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
@@ -713,6 +699,11 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
+  <customwidget>
    <class>KIntSpinBox</class>
    <extends>QSpinBox</extends>
    <header>knuminput.h</header>
@@ -730,7 +721,6 @@
  </customwidgets>
  <tabstops>
   <tabstop>titleEdit</tabstop>
-  <tabstop>langIDEdit</tabstop>
   <tabstop>commentEdit</tabstop>
   <tabstop>setFontButton</tabstop>
   <tabstop>openButton</tabstop>


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