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

List:       kde-commits
Subject:    extragear/network/kftpgrabber/src
From:       Jernej Kos <kostko () unimatrix-one ! org>
Date:       2005-08-12 17:19:45
Message-ID: 1123867185.868332.10831.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 446150 by kostko:

Added the global encoding configuration option.

FEATURE: 106024

 M  +5 -0      misc/kftpgrabber.kcfg  
 M  +34 -3     ui/config_general.ui  
 M  +1 -1      widgets/bookmarks/editor.cpp  
 M  +14 -0     widgets/configdialog.cpp  
 M  +4 -1      widgets/kftpquickconnectdialog.cpp  


--- trunk/extragear/network/kftpgrabber/src/misc/kftpgrabber.kcfg #446149:446150
@@ -93,6 +93,11 @@
       <default>true</default>
       <label>Should a "confirm disconnect" dialog be displayed each time a \
disconnect is requested.</label>  </entry>
+    
+    <entry name="defEncoding" type="String">
+      <default>iso 8859-1</default>
+      <label>The default site encoding.</label>
+    </entry>
   </group>
   
   <group name="Actions">
--- trunk/extragear/network/kftpgrabber/src/ui/config_general.ui #446149:446150
@@ -130,10 +130,10 @@
                                     <cstring>kcfg_showSystrayIcon</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Show the systray &amp;icon</string>
+                                    <string>Show the s&amp;ystray icon</string>
                                 </property>
                                 <property name="accel">
-                                    <string>Alt+I</string>
+                                    <string>Alt+Y</string>
                                 </property>
                             </widget>
                         </vbox>
@@ -272,6 +272,37 @@
                                     </widget>
                                 </hbox>
                             </widget>
+                            <widget class="QLayoutWidget">
+                                <property name="name">
+                                    <cstring>layout13</cstring>
+                                </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="QLabel">
+                                        <property name="name">
+                                            <cstring>textLabel1_2</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Encoding:</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="KComboBox">
+                                        <property name="name">
+                                            <cstring>cfg_defEncoding</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
                         </vbox>
                     </widget>
                     <widget class="QGroupBox">
@@ -324,7 +355,7 @@
                         <property name="sizeHint">
                             <size>
                                 <width>21</width>
-                                <height>50</height>
+                                <height>30</height>
                             </size>
                         </property>
                     </spacer>
--- trunk/extragear/network/kftpgrabber/src/widgets/bookmarks/editor.cpp \
#446149:446150 @@ -341,7 +341,7 @@
 
   QString serverEncoding = m_activeSite->getProperty("encoding");
   if (serverEncoding.isEmpty())
-    serverEncoding = "iso 8859-1";
+    serverEncoding = KFTPCore::Config::defEncoding();
 
   serverEncoding = QString("%1 ( %2 \
)").arg(KGlobal::charsets()->languageForEncoding(serverEncoding)).arg(serverEncoding);
  m_properties->serverEncoding->setCurrentText(serverEncoding);
--- trunk/extragear/network/kftpgrabber/src/widgets/configdialog.cpp #446149:446150
@@ -44,6 +44,9 @@
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <knuminput.h>
+#include <kglobal.h>
+#include <kcharsets.h>
+#include <kcombobox.h>
 
 #include <qframe.h>
 #include <qlayout.h>
@@ -115,6 +118,14 @@
   KFTPCore::Config::self()->uActions()->updateWidget();
   KFTPCore::Config::self()->fActions()->updateWidget();
   
+  // Populate charsets
+  QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames();
+  static_cast<KComboBox*>(child("cfg_defEncoding"))->insertStringList(charsets);
+  
+  QString defEncoding = KFTPCore::Config::defEncoding();
+  defEncoding = QString("%1 ( %2 \
)").arg(KGlobal::charsets()->languageForEncoding(defEncoding)).arg(defEncoding); +  \
static_cast<KComboBox*>(child("cfg_defEncoding"))->setCurrentText(defEncoding); +  
   m_configFilter->loadSettings();
 }
 
@@ -127,6 +138,9 @@
   
   m_configFilter->saveSettings();
   
+  // Save encoding
+  KFTPCore::Config::setDefEncoding(KGlobal::charsets()->encodingForName(static_cast<KComboBox*>(child("cfg_defEncoding"))->currentText()));
 +  
   // Show/hide the systray icon
   if (KFTPCore::Config::showSystrayIcon())
     s_sysTray->show();
--- trunk/extragear/network/kftpgrabber/src/widgets/kftpquickconnectdialog.cpp \
#446149:446150 @@ -101,7 +101,10 @@
   // Populate charsets
   QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames();
   m_layout->serverEncoding->insertStringList(charsets);
-  m_layout->serverEncoding->setCurrentText("iso 8859-1");
+  
+  QString defEncoding = KFTPCore::Config::defEncoding();
+  defEncoding = QString("%1 ( %2 \
)").arg(KGlobal::charsets()->languageForEncoding(defEncoding)).arg(defEncoding); +  \
m_layout->serverEncoding->setCurrentText(defEncoding);  }
 
 KFTPQuickConnectDialog::~KFTPQuickConnectDialog()


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