[Krusader-commits] SF.net SVN: krusader:[6078] trunk/krusader_kde4

[<ck...@us...>]

Revision: 6078
          http://krusader.svn.sourceforge.net/krusader/?rev=6078&view=rev
Author:   ckarai
Date:     2008-09-04 23:21:55 +0000 (Thu, 04 Sep 2008)

Log Message:
-----------
FIXED: various konfigurator bugs

Modified Paths:
--------------
    trunk/krusader_kde4/ChangeLog
    trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp
    trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp
    trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h
    trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp

Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog	2008-09-02 22:02:41 UTC (rev 6077)
+++ trunk/krusader_kde4/ChangeLog	2008-09-04 23:21:55 UTC (rev 6078)
@@ -9,6 +9,8 @@
      ARCH: QuickSearch is moved to KrView from Detailed/Brief views
      ARCH: Keyboard handling is moved to KrView from Detailed/Brief views
 
+    FIXED: Konfigurator doesn't detect every mimetype for "zip" files
+    FIXED: Konfigurator keeps its original size
     FIXED: Konfigurator has scrollbars if necessary.
     FIXED: [ 2027518 ] Does not build with -DBUILD_SHARED_LIBS:BOOL=ON
            (thanks to Funda Wang)

Modified: trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp	2008-09-02 22:02:41 UTC (rev 6077)
+++ trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp	2008-09-04 23:21:55 UTC (rev 6078)
@@ -51,7 +51,7 @@
                                          "application/x-gzip,application/x-jar,"
                                          "application/x-lha,application/x-lha-compressed,"
                                          "application/x-rar,application/x-rar-compressed,"
-                                         "application/x-rpm,application/zip"
+                                         "application/x-rpm,application/zip,"
                                          "application/x-zip,application/x-zip-compressed";
 QString KgProtocols::defaultTarMimes   = "application/x-tar,application/x-tarz,"
                                          "application/x-compressed-tar,"

Modified: trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp	2008-09-02 22:02:41 UTC (rev 6077)
+++ trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp	2008-09-04 23:21:55 UTC (rev 6078)
@@ -57,12 +57,13 @@
 #include "kgcolors.h"
 #include "kguseractions.h"
 #include "kgprotocols.h"
+#include <qevent.h>
 
 Konfigurator::Konfigurator( bool f, int startPage ) : KPageDialog( (QWidget *)0 ), firstTime(f), internalCall( false ),
-      restartGUI( false )
+      restartGUI( false ), sizeX( -1 ), sizeY( -1 )
 {
   setButtons( KDialog::Help | KDialog::User1 | KDialog::Apply | KDialog::Cancel );
-  setDefaultButton( KDialog::User1 );
+  setDefaultButton( KDialog::Apply );
   setWindowTitle( i18n( "Konfigurator" ) );
   setButtonGuiItem( KDialog::User1, KGuiItem( i18n("Defaults") ) );
   setWindowModality( Qt::WindowModal );
@@ -81,10 +82,56 @@
   connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotUser1() ) );
   
   createLayout( startPage );
-  resize( 900, 900 );
+
+  KConfigGroup group( krConfig, "Konfigurator");
+  int sx = group.readEntry( "Window Width", -1 );
+  int sy = group.readEntry( "Window Height", -1 );
+
+  if( sx != -1 && sy != -1 )
+    resize( sx, sy );
+  else
+    resize( 900, 900 );
+
+  if( group.readEntry( "Window Maximized",  false ) )
+      showMaximized();
+  else
+      show();
+
   exec();
 }
 
+void Konfigurator::resizeEvent( QResizeEvent *e )
+{
+  if( !isMaximized() )
+  {
+    sizeX = e->size().width();
+    sizeY = e->size().height();
+  }
+
+  KDialog::resizeEvent( e );
+}
+
+void Konfigurator::closeDialog()
+{
+  KConfigGroup group( krConfig, "Konfigurator");
+
+  group.writeEntry("Window Width", sizeX );
+  group.writeEntry("Window Height", sizeY );
+  group.writeEntry("Window Maximized", isMaximized() );
+}
+
+void Konfigurator::reject()
+{
+  closeDialog();
+  KDialog::reject();
+}
+
+void Konfigurator::accept()
+{
+  closeDialog();
+  KDialog::accept();
+}
+
 void Konfigurator::newPage(KonfiguratorPage *page, const QString &name, const QString &desc, const KIcon &kicon )
 {
   KPageWidgetItem *item = new KPageWidgetItem( page, name );
@@ -177,6 +224,7 @@
     {
     case KMessageBox::No:
       currentPg->loadInitialValues();
+      currentPg->apply();
       break;
     case KMessageBox::Yes:
       if( currentPg->apply() )

Modified: trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h
===================================================================
--- trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h	2008-09-02 22:02:41 UTC (rev 6077)
+++ trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h	2008-09-04 23:21:55 UTC (rev 6078)
@@ -41,6 +41,8 @@
 
 class QLineEdit;
 class QString;
+class QResizeEvent;
+class QCloseEvent;
 
 class Konfigurator : public KPageDialog
 {
@@ -52,10 +54,16 @@
 
   bool isGUIRestartNeeded() { return restartGUI; }
 
+  virtual void accept();
+  virtual void reject();
+
 protected:
   void newPage(KonfiguratorPage *, const QString &, const QString &, const KIcon & );// adds widget and connects to slot
   void createLayout( int startPage );
+  void closeDialog();
 
+  virtual void resizeEvent( QResizeEvent *e );
+
 protected slots:
   void slotUser1();
   void slotApply();   // actually used for defaults
@@ -71,6 +79,8 @@
   bool                        internalCall;
   QTimer                      restoreTimer;
   bool                        restartGUI;
+  int                         sizeX;
+  int                         sizeY;
 };
 
 #endif

Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp	2008-09-02 22:02:41 UTC (rev 6077)
+++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp	2008-09-04 23:21:55 UTC (rev 6078)
@@ -31,6 +31,7 @@
 #include "konfiguratoritems.h"
 #include "../krusader.h"
 #include <klocale.h>
+#include <klineedit.h>
 #include <qpainter.h>
 #include <qpen.h>
 #include <qcolordialog.h>
@@ -376,7 +377,7 @@
 void KonfiguratorURLRequester::loadInitialValue()
 {
   KConfigGroup group( krConfig, ext->getCfgClass() );
-  setUrl( group.readEntry( ext->getCfgName(), defaultValue ) );
+  lineEdit()->setText( group.readEntry( ext->getCfgName(), defaultValue ) );
   ext->setChanged( false );
 }
 
@@ -388,7 +389,7 @@
 void KonfiguratorURLRequester::slotSetDefaults(QObject *)
 {
   if( url() != defaultValue )
-    setUrl( defaultValue );
+    lineEdit()->setText( defaultValue );
 }
 
 // KonfiguratorFontChooser class


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.