kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00
Code Issues Projects Releases Wiki Activity

Byebye Q3H(V)Box

Browse Source 
svn path=/trunk/playground/utils/dolphin/; revision=607111
This commit is contained in:
Laurent Montel 2006-11-23 07:54:24 +00:00
parent 7fec7ff9a0
commit edb2c4ad62
14 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bookmarkssettingspage.cpp
View File

@ -25,7 +25,7 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <q3vbox.h>
//Added by qt3to4:
#include <QPixmap>
#include <Q3VBoxLayout>
@ -37,6 +37,7 @@
#include <k3listview.h>
#include <klocale.h>
#include <kpushbutton.h>
#include <kvbox.h>
#include "dolphinsettings.h"
#include "editbookmarkdialog.h"
@ -52,7 +53,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
const int spacing = KDialog::spacingHint();
Q3HBox* hBox = new Q3HBox(parent);
KHBox* hBox = new KHBox(parent);
hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
hBox->setSpacing(spacing);
hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
@ -72,7 +73,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
connect(m_listView, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)),
this, SLOT(slotBookmarkDoubleClicked(Q3ListViewItem*, const QPoint&, int)));
Q3VBox* buttonBox = new Q3VBox(hBox);
KVBox* buttonBox = new KVBox(hBox);
buttonBox->setSpacing(spacing);
const QSizePolicy buttonSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);

5
src/detailsviewsettingspage.cpp
View File

@ -32,12 +32,13 @@
#include <qcombobox.h>
#include <q3groupbox.h>
#include <q3groupbox.h>
#include <kvbox.h>
#include "dolphinsettings.h"
#include "detailsmodesettings.h"
#include "dolphindetailsview.h"
DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) :
Q3VBox(parent),
KVBox(parent),
m_dateBox(0),
m_permissionsBox(0),
m_ownerBox(0),
@ -61,7 +62,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) :
columnsGroup->setSizePolicy(sizePolicy);
columnsGroup->setMargin(margin);
Q3HBox* visibleColumnsLayout = new Q3HBox(columnsGroup);
KHBox* visibleColumnsLayout = new KHBox(columnsGroup);
m_dateBox = new QCheckBox(i18n("Date"), visibleColumnsLayout);
m_dateBox->setChecked(settings->showDate());

5
src/detailsviewsettingspage.h
View File

@ -21,7 +21,8 @@
#ifndef DETAILSVIEWSETTINGSPAGE_H
#define DETAILSVIEWSETTINGSPAGE_H
#include <q3vbox.h>
#include <kvbox.h>
class QCheckBox;
class QFontComboBox;
class QSpinBox;
@ -34,7 +35,7 @@ class QRadioButton;
*
* @author Peter Penz <peter.penz@gmx.at>
*/
class DetailsViewSettingsPage : public Q3VBox
class DetailsViewSettingsPage : public KVBox
{
Q_OBJECT

3
src/dolphin.h
View File

@ -34,6 +34,7 @@
//Added by qt3to4:
#include <QCloseEvent>
#include <ksortablelist.h>
#include <kvbox.h>
#include "dolphinview.h"
#include "undomanager.h"
@ -42,7 +43,7 @@ class KPrinter;
class KUrl;
class QLineEdit;
class KFileIconView;
class Q3HBox;
class KHBox;
class Q3IconViewItem;
class QSplitter;
class KAction;

3
src/dolphinstatusbar.cpp
View File

@ -23,13 +23,14 @@
#include <qlabel.h>
#include <qtimer.h>
#include <kiconloader.h>
#include <kvbox.h>
#include "dolphinview.h"
#include "statusbarmessagelabel.h"
#include "statusbarspaceinfo.h"
DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
Q3HBox(parent),
KHBox(parent),
m_messageLabel(0),
m_spaceInfo(0),
m_progressBar(0),

5
src/dolphinstatusbar.h
View File

@ -21,9 +21,10 @@
#ifndef DOLPHINSTATUSBAR_H
#define DOLPHINSTATUSBAR_H
#include <q3hbox.h>
//Added by qt3to4:
#include <QLabel>
#include <khbox.h>
class QProgressBar;
class QLabel;
class QTimer;
@ -40,7 +41,7 @@ class KUrl;
*
* @author Peter Penz
*/
class DolphinStatusBar : public Q3HBox {
class DolphinStatusBar : public KHBox {
Q_OBJECT
public:

5
src/editbookmarkdialog.cpp
View File

@ -31,7 +31,8 @@
#include <kurl.h>
#include <kfiledialog.h>
#include <kicondialog.h>
#include <q3hbox.h>
#include <kvbox.h>
EditBookmarkDialog::~EditBookmarkDialog()
{
@ -96,7 +97,7 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title,
// create location widgets
new QLabel(i18n("Location:"), grid);
Q3HBox* locationBox = new Q3HBox(grid);
KHBox* locationBox = new KHBox(grid);
locationBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
locationBox->setSpacing(spacingHint());
m_location = new QLineEdit(url.prettyUrl(), locationBox);

9
src/generalsettingspage.cpp
View File

@ -26,7 +26,7 @@
#include <kdialog.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <q3vbox.h>
#include <q3grid.h>
#include <q3groupbox.h>
#include <klocale.h>
@ -35,6 +35,7 @@
#include <qpushbutton.h>
#include <kfiledialog.h>
#include <qradiobutton.h>
#include <kvbox.h>
#include "dolphinsettings.h"
#include "dolphin.h"
@ -55,7 +56,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
GeneralSettings* settings = DolphinSettings::instance().generalSettings();
Q3VBox* vBox = new Q3VBox(parent);
KVBox* vBox = new KVBox(parent);
vBox->setSizePolicy(sizePolicy);
vBox->setSpacing(spacing);
vBox->setMargin(margin);
@ -66,7 +67,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
homeGroup->setSizePolicy(sizePolicy);
homeGroup->setMargin(margin);
Q3HBox* homeUrlBox = new Q3HBox(homeGroup);
KHBox* homeUrlBox = new KHBox(homeGroup);
homeUrlBox->setSizePolicy(sizePolicy);
homeUrlBox->setSpacing(spacing);
@ -77,7 +78,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
connect(selectHomeUrlButton, SIGNAL(clicked()),
this, SLOT(selectHomeUrl()));
Q3HBox* buttonBox = new Q3HBox(homeGroup);
KHBox* buttonBox = new KHBox(homeGroup);
buttonBox->setSizePolicy(sizePolicy);
buttonBox->setSpacing(spacing);
QPushButton* useCurrentButton = new QPushButton(i18n("Use current location"), buttonBox);

9
src/iconsviewsettingspage.cpp
View File

@ -30,6 +30,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <assert.h>
#include <kvbox.h>
#include "iconsmodesettings.h"
#include "dolphinsettings.h"
@ -40,7 +41,7 @@
IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
QWidget* parent) :
Q3VBox(parent),
KVBox(parent),
m_mode(mode),
m_iconSizeSlider(0),
m_previewSizeSlider(0),
@ -61,7 +62,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
assert(settings != 0);
Q3HBox* sizesLayout = new Q3HBox(this);
KHBox* sizesLayout = new KHBox(this);
sizesLayout->setSpacing(spacing);
sizesLayout->setSizePolicy(sizePolicy);
@ -72,7 +73,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
const QColor iconBackgroundColor(KGlobalSettings::baseColor());
Q3HBox* iconSizeVBox = new Q3HBox(iconSizeGroup);
KHBox* iconSizeVBox = new KHBox(iconSizeGroup);
iconSizeVBox->setSpacing(spacing);
new QLabel(i18n("Small"), iconSizeVBox);
m_iconSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, iconSizeVBox);
@ -94,7 +95,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
previewSizeGroup->setSizePolicy(sizePolicy);
previewSizeGroup->setMargin(margin);
Q3HBox* previewSizeVBox = new Q3HBox(previewSizeGroup);
KHBox* previewSizeVBox = new KHBox(previewSizeGroup);
previewSizeVBox->setSpacing(spacing);
new QLabel(i18n("Small"), previewSizeVBox);
m_previewSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, previewSizeVBox);

5
src/iconsviewsettingspage.h
View File

@ -21,8 +21,9 @@
#ifndef ICONSVIEWSETTINGSPAGE_H
#define ICONSVIEWSETTINGSPAGE_H
#include <q3vbox.h>
#include <dolphiniconsview.h>
#include <kvbox.h>
class QSlider;
class QComboBox;
@ -49,7 +50,7 @@ class PixmapViewer;
* @see DolphinIconsViewSettings
* @author Peter Penz <peter.penz@gmx.at>
*/
class IconsViewSettingsPage : public Q3VBox
class IconsViewSettingsPage : public KVBox
{
Q_OBJECT

5
src/infosidebarpage.cpp
View File

@ -25,7 +25,7 @@
#include <qlabel.h>
#include <qtimer.h>
#include <qpushbutton.h>
#include <q3vbox.h>
#include <q3vgroupbox.h>
#include <q3popupmenu.h>
#include <qpainter.h>
@ -45,6 +45,7 @@
#include <kdialog.h>
#include <kglobalsettings.h>
#include <kfilemetainfo.h>
#include <kvbox.h>
#include "dolphin.h"
#include "pixmapviewer.h"
@ -94,7 +95,7 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
sep2->setFixedHeight(1);
// actions
m_actionBox = new Q3VBox(this);
m_actionBox = new KVBox(this);
m_actionBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
// Add a dummy widget with no restriction regarding a vertical resizing.

5
src/infosidebarpage.h
View File

@ -33,6 +33,7 @@
#include <kurl.h>
#include <kmimetype.h>
#include <kdedesktopmimetype.h>
#include <kvbox.h>
namespace KIO {
class Job;
@ -44,7 +45,7 @@ class QString;
class QPainter;
class KFileItem;
class QLabel;
class Q3VBox;
class KVBox;
class Q3Grid;
class PixmapViewer;
@ -161,7 +162,7 @@ private:
Q3Grid* m_infoGrid;
Q3PtrList<QLabel> m_infoWidgets; // TODO: use children() from QObject instead
Q3VBox* m_actionBox;
KVBox* m_actionBox;
Q3PtrList<QWidget> m_actionWidgets; // TODO: use children() from QObject instead
Q3ValueVector<KDEDesktopMimeType::Service> m_actionsVector;
};

5
src/urlnavigator.cpp
View File

@ -48,6 +48,7 @@
#include <kurlcombobox.h>
#include <kurlcompletion.h>
#include <kbookmarkmanager.h>
#include <kvbox.h>
#include "bookmarkselector.h"
#include "dolphin.h"
@ -80,7 +81,7 @@ UrlNavigator::HistoryElem::~HistoryElem()
UrlNavigator::UrlNavigator(const KUrl& url,
DolphinView* dolphinView) :
Q3HBox(dolphinView),
KHBox(dolphinView),
m_historyIndex(0),
m_dolphinView(dolphinView),
m_protocols(0),
@ -279,7 +280,7 @@ DolphinView* UrlNavigator::dolphinView() const
void UrlNavigator::keyReleaseEvent(QKeyEvent* event)
{
Q3HBox::keyReleaseEvent(event);
KHBox::keyReleaseEvent(event);
if (isUrlEditable() && (event->key() == Qt::Key_Escape)) {
setUrlEditable(false);
}

5
src/urlnavigator.h
View File

@ -21,7 +21,7 @@
#ifndef UrlNAVIGATOR_H
#define UrlNAVIGATOR_H
#include <q3hbox.h>
//Added by qt3to4:
#include <QLabel>
#include <Q3ValueList>
@ -29,6 +29,7 @@
#include <Q3PopupMenu>
#include <kurl.h>
#include <qstring.h>
#include <kvbox.h>
class QComboBox;
class QLabel;
@ -66,7 +67,7 @@ class ProtocolCombo;
typedef Q3ValueList<KUrl> UrlStack;
class UrlNavigator : public Q3HBox
class UrlNavigator : public KHBox
{
Q_OBJECT