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

List:       kde-commits
Subject:    kdebase/kcontrol/kio
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2005-02-14 21:03:49
Message-ID: 20050214210349.268341D00E () office ! kde ! org
[Download RAW message or body]

CVS commit by neundorf: 


-remove the unused "default workgroup" and "show hidden shares" options rom
the config module

Alex


  M +14 -14    smbrodlg.cpp   1.17
  M +3 -3      smbrodlg.h   1.4


--- kdebase/kcontrol/kio/smbrodlg.cpp  #1.16:1.17
@@ -55,5 +55,5 @@ SMBRoOptions::SMBRoOptions(QWidget *pare
    layout->addWidget(m_passwordLe,2,1);
 
-   m_workgroupLe=new QLineEdit(this);
+/*   m_workgroupLe=new QLineEdit(this);
    label=new QLabel(m_workgroupLe,i18n("Workgroup:"),this);
    layout->addWidget(label,3,0);
@@ -61,5 +61,5 @@ SMBRoOptions::SMBRoOptions(QWidget *pare
 
    m_showHiddenShares=new QCheckBox(i18n("Show hidden shares"),this);
-   layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
+   layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);*/
 
    m_encodingList = new KComboBox( false, this );
@@ -68,16 +68,16 @@ SMBRoOptions::SMBRoOptions(QWidget *pare
 
    label = new QLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
-   layout->addWidget( label, 5, 0 );
-   layout->addWidget( m_encodingList, 5, 1 );
+   layout->addWidget( label, 3, 0 );
+   layout->addWidget( m_encodingList, 3, 1 );
 
-   layout->addWidget(new QWidget(this),6,0);
+   layout->addWidget(new QWidget(this),4,0);
 
-   connect(m_showHiddenShares, SIGNAL(toggled(bool)), this, SLOT(changed()));
+//   connect(m_showHiddenShares, SIGNAL(toggled(bool)), this, SLOT(changed()));
    connect(m_userLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
    connect(m_passwordLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
-   connect(m_workgroupLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
+//   connect(m_workgroupLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
    connect( m_encodingList, SIGNAL( activated( const QString & ) ), this , SLOT( changed() ) );
 
-   layout->setRowStretch(6,1);
+   layout->setRowStretch(4, 1);
 
    // finaly read the options
@@ -96,6 +96,6 @@ void SMBRoOptions::load()
    cfg->setGroup( "Browser Settings/SMBro" );
    m_userLe->setText(cfg->readEntry("User"));
-   m_workgroupLe->setText(cfg->readEntry("Workgroup"));
-   m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
+//   m_workgroupLe->setText(cfg->readEntry("Workgroup"));
+//   m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
 
    QStringList _strList = KGlobal::charsets()->availableEncodingNames();
@@ -128,6 +128,6 @@ void SMBRoOptions::save()
    cfg->setGroup( "Browser Settings/SMBro" );
    cfg->writeEntry( "User", m_userLe->text());
-   cfg->writeEntry( "Workgroup", m_workgroupLe->text());
-   cfg->writeEntry( "ShowHiddenShares", m_showHiddenShares->isChecked());
+//   cfg->writeEntry( "Workgroup", m_workgroupLe->text());
+//   cfg->writeEntry( "ShowHiddenShares", m_showHiddenShares->isChecked());
    cfg->writeEntry( "Encoding", m_encodingList->currentText() );
 
@@ -157,6 +157,6 @@ void SMBRoOptions::defaults()
    m_userLe->setText("");
    m_passwordLe->setText("");
-   m_workgroupLe->setText("");
-   m_showHiddenShares->setChecked(false);
+//   m_workgroupLe->setText("");
+//   m_showHiddenShares->setChecked(false);
 }
 

--- kdebase/kcontrol/kio/smbrodlg.h  #1.3:1.4
@@ -1,5 +1,5 @@
 /*  This file is part of the KDE project
 
-    Copyright (C) 2000 Alexander Neundorf <neundorf@kde.org>
+    Copyright (C) 2000, 2005 Alexander Neundorf <neundorf@kde.org>
 
     This library is free software; you can redistribute it and/or
@@ -48,6 +48,6 @@ class SMBRoOptions : public KCModule
       QLineEdit *m_userLe;
       QLineEdit *m_passwordLe;
-      QLineEdit *m_workgroupLe;
-      QCheckBox *m_showHiddenShares;
+//      QLineEdit *m_workgroupLe; //currently unused, Alex
+//      QCheckBox *m_showHiddenShares; //currently unused, Alex
       KComboBox *m_encodingList;
 };


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