kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Hide the filler widget when showing the traditional view. Fixed issue when toggling between breadcrumb and traditional view.

Browse Source 
svn path=/trunk/KDE/kdebase/apps/; revision=634598
This commit is contained in:
Peter Penz 2007-02-17 18:47:19 +00:00
parent 4bf793794f
commit 383aab8c13
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/urlnavigator.cpp
View File

@ -72,7 +72,8 @@ UrlNavigator::UrlNavigator(const KUrl& url,
m_layout(0),
m_protocols(0),
m_protocolSeparator(0),
m_host(0)
m_host(0),
m_filler(0)
{
m_layout = new QHBoxLayout();
m_layout->setSpacing(0);
@ -87,7 +88,7 @@ UrlNavigator::UrlNavigator(const KUrl& url,
m_toggleButton->setFocusPolicy(Qt::NoFocus);
m_toggleButton->setMinimumHeight(minimumHeight());
connect(m_toggleButton, SIGNAL(clicked()),
this, SLOT(slotClicked()));
this, SLOT(switchView()));
if (DolphinSettings::instance().generalSettings()->editableUrl()) {
m_toggleButton->toggle();
}
@ -113,13 +114,13 @@ UrlNavigator::UrlNavigator(const KUrl& url,
// Append a filler widget at the end, which automatically resizes to the
// maximum available width. This assures that the URL navigator uses the
// whole width, so that the clipboard content can be dropped.
QWidget* filler = new QWidget();
filler->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_filler = new QWidget();
m_filler->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_layout->addWidget(m_toggleButton);
m_layout->addWidget(m_bookmarkSelector);
m_layout->addWidget(m_pathBox);
m_layout->addWidget(filler);
m_layout->addWidget(m_filler);
setLayout(m_layout);
updateContent();
@ -194,7 +195,7 @@ void UrlNavigator::setUrlEditable(bool editable)
{
if (isUrlEditable() != editable) {
m_toggleButton->toggle();
slotClicked();
switchView();
}
}
@ -421,7 +422,9 @@ void UrlNavigator::slotProtocolChanged(const QString& protocol)
else {
if (!m_host) {
m_protocolSeparator = new QLabel("://", this);
appendWidget(m_protocolSeparator);
m_host = new QLineEdit(this);
appendWidget(m_host);
connect(m_host, SIGNAL(lostFocus()),
this, SLOT(slotRemoteHostActivated()));
@ -450,16 +453,16 @@ kDebug() << "received redirection from " << oldUrl << " to " << newUrl << endl;
m_urls.append(newUrl);*/
}
void UrlNavigator::slotClicked()
void UrlNavigator::switchView()
{
updateContent();
if (isUrlEditable()) {
m_pathBox->setFocus();
updateContent();
}
else {
setUrl(m_pathBox->currentText());
emit requestActivation();
}
emit requestActivation();
}
void UrlNavigator::updateHistoryElem()
@ -490,6 +493,7 @@ void UrlNavigator::updateContent()
delete m_protocolSeparator; m_protocolSeparator = 0;
delete m_host; m_host = 0;
deleteButtons();
m_filler->hide();
m_toggleButton->setToolTip(i18n("Browse (%1, Escape)", shortcut));
@ -502,6 +506,7 @@ void UrlNavigator::updateContent()
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_pathBox->hide();
m_filler->show();
// get the data from the currently selected bookmark
KBookmark bookmark = m_bookmarkSelector->selectedBookmark();
@ -541,6 +546,7 @@ void UrlNavigator::updateContent()
if (!m_protocols) {
deleteButtons();
m_protocols = new ProtocolCombo(protocol, this);
appendWidget(m_protocols);
connect(m_protocols, SIGNAL(activated(const QString&)),
this, SLOT(slotProtocolChanged(const QString&)));
}

7
src/urlnavigator.h
View File

@ -243,11 +243,11 @@ private slots:
void slotRedirection(const KUrl&, const KUrl&);
/**
* Switches the navigation bar between the editable and noneditable
* state (see setUrlEditable()) and is connected to the clicked signal
* Switches the navigation bar between the breadcrumb view and the
* traditional view (see setUrlEditable()) and is connected to the clicked signal
* of the navigation bar button.
*/
void slotClicked();
void switchView();
private:
/**
@ -301,6 +301,7 @@ private:
QLabel* m_protocolSeparator;
QLineEdit* m_host;
QLinkedList<UrlNavigatorButton*> m_navButtons;
QWidget* m_filler;
//UrlStack m_urls;
};