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

List:       kde-commits
Subject:    playground/base/plasma/applets/welcome/cpp
From:       Matthew Adams <roguestar191 () comcast ! net>
Date:       2009-01-31 21:11:19
Message-ID: 1233436279.966136.684.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 919388 by madams:

Add configurable default download folder

 M  +16 -1     includes/welcomeConfig.ui  
 M  +2 -2      source/Ui_Browser.cpp  
 M  +4 -1      source/welcome.cpp  


--- trunk/playground/base/plasma/applets/welcome/cpp/includes/welcomeConfig.ui \
#919387:919388 @@ -29,7 +29,7 @@
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="currentIndex" >
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page" >
       <property name="geometry" >
@@ -464,6 +464,16 @@
           <item row="0" column="1" >
            <widget class="QLineEdit" name="defaultWebsite" />
           </item>
+          <item row="2" column="0" colspan="2" >
+           <widget class="KUrlRequester" name="defaultDownloadFolder" />
+          </item>
+          <item row="1" column="0" colspan="2" >
+           <widget class="QLabel" name="label_9" >
+            <property name="text" >
+             <string>Default download folder</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -492,6 +502,11 @@
    <extends>QPushButton</extends>
    <header>kpushbutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>KUrlRequester</class>
+   <extends>QFrame</extends>
+   <header>kurlrequester.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
--- trunk/playground/base/plasma/applets/welcome/cpp/source/Ui_Browser.cpp \
#919387:919388 @@ -560,7 +560,7 @@
 				
 				QString defaultFileName = QFileInfo(reply->url().toString()).fileName();
 				std::cout << "Default filename: " << defaultFileName.toLocal8Bit().data() << \
                "\n";
-                                QString fileName = QFileDialog::getSaveFileName(0, \
tr("Save File"), defaultFileName.insert(0, "~/")); +                                \
QString fileName = QFileDialog::getSaveFileName(0, tr("Save File"), \
defaultFileName.insert(0, cg.readEntry("Default Download Folder", "~/")));  if \
(fileName.isEmpty())  return;
 //				QNetworkRequest request = reply->request();
@@ -578,7 +578,7 @@
 				// they want the file and to select a download
 				// location and name.
 				QString defaultFileName = QFileInfo(request.url().toString()).fileName();
-				QString fileName = QFileDialog::getSaveFileName(0, tr("Save File"), \
defaultFileName); +				QString fileName = QFileDialog::getSaveFileName(0, tr("Save \
File"), defaultFileName.insert(0, cg.readEntry("Default Download Folder", "~/")));  \
if (fileName.isEmpty())  return;
 				// Construct a new request that stores the
--- trunk/playground/base/plasma/applets/welcome/cpp/source/welcome.cpp \
#919387:919388 @@ -74,7 +74,9 @@
     KConfigGroup cg = config();
 
   ui.defaultWebsite->setText(cg.readEntry("Default Website", \
                "http://www.kde.org/"));
-  ui.tipFileBox->setCurrentIndex(ui.tipFileBox->findText(cg.readEntry("Default \
Tipfile", KStandardDirs::locate("data", "welcome/tips")))); +  \
ui.tipFileBox->setCurrentIndex(ui.tipFileBox->findText(cg.readEntry("Default \
Tipfile", KStandardDirs::locate("data", "welcome/tips"))));  +  \
ui.defaultDownloadFolder->setPath(cg.readEntry("Default Download Folder", "~/")); +  \
ui.defaultDownloadFolder->setMode(KFile::Directory);  
   ui.useGlowAnimation->setChecked(cg.readEntry("Use Glow Animation", false));
   ui.useFadeAnimation->setChecked(cg.readEntry("Use Fade Animation", true));
@@ -125,6 +127,7 @@
 	cg.writeEntry("Default Tipfile", ui.tipFileBox->currentText());
    else 
 	cg.writeEntry("Default Tipfile", KStandardDirs::locate("data", "welcome/tips"));
+   cg.writeEntry("Default Download Folder", \
((QUrl)(ui.defaultDownloadFolder->url())).toString().append("/"));  \
cg.writeEntry("Default Tab", ui.defaultTab->value()-1);  cg.writeEntry("Max Rise", \
ui.maxRise->value());  cg.writeEntry("Max Wave", ui.maxWave->value());


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