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

--deprecation

Browse Source 
svn path=/trunk/playground/utils/dolphin/; revision=612307
This commit is contained in:
Holger Freyther 2006-12-10 20:34:43 +00:00
parent 4b0293e22e
commit 328de20871
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bookmarkselector.h
View File

@ -23,8 +23,6 @@
#include <kbookmark.h>
#include <urlbutton.h>
//Added by qt3to4:
#include <Q3PopupMenu>
class UrlNavigator;
class Q3PopupMenu;

14
src/dolphinmainwindow.cpp
View File

@ -356,14 +356,14 @@ void DolphinMainWindow::readProperties(KConfig* config)
{
config->setGroup("Primary view");
m_view[PrimaryIdx]->setUrl(config->readEntry("Url"));
m_view[PrimaryIdx]->setUrlEditable(config->readBoolEntry("Editable Url"));
m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
if (config->hasGroup("Secondary view")) {
config->setGroup("Secondary view");
if (m_view[SecondaryIdx] == 0) {
toggleSplitView();
}
m_view[SecondaryIdx]->setUrl(config->readEntry("Url"));
m_view[SecondaryIdx]->setUrlEditable(config->readBoolEntry("Editable Url"));
m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
}
else if (m_view[SecondaryIdx] != 0) {
toggleSplitView();
@ -458,7 +458,7 @@ void DolphinMainWindow::createFile()
bool found = false;
CreateFileEntry entry;
while (!found && (it != end)) {
if ((*it).index() == senderName) {
if ((*it).key() == senderName) {
entry = (*it).value();
found = true;
}
@ -475,7 +475,7 @@ void DolphinMainWindow::createFile()
// Get the source path of the template which should be copied.
// The source path is part of the Url entry of the desktop file.
const int pos = entry.templatePath.findRev('/');
const int pos = entry.templatePath.lastIndexOf('/');
QString sourcePath(entry.templatePath.left(pos + 1));
sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url");
@ -485,7 +485,7 @@ void DolphinMainWindow::createFile()
name.replace("...", QString::null);
// add the file extension to the name
name.append(sourcePath.right(sourcePath.length() - sourcePath.findRev('.')));
name.append(sourcePath.right(sourcePath.length() - sourcePath.lastIndexOf('.')));
// Check whether a file with the current name already exists. If yes suggest automatically
// a unique file name (e. g. "HTML File" will be replaced by "HTML File_1").
@ -720,7 +720,7 @@ void DolphinMainWindow::updatePasteAction()
QString text(i18n("Paste"));
QClipboard* clipboard = QApplication::clipboard();
QMimeSource* data = clipboard->data();
const QMimeData* data = clipboard->mimeData();
/* KDE4-TODO:
if (KUrlDrag::canDecode(data)) {
pasteAction->setEnabled(true);
@ -1056,7 +1056,7 @@ void DolphinMainWindow::addUndoOperation(KJob* job)
while (sourceIt != sourceEnd) {
QMap<QString, QString>::ConstIterator metaIt = metaData.find("trashUrl-" + (*sourceIt).path());
if (metaIt != metaData.end()) {
newSourceUrls.append(KUrl(metaIt.data()));
newSourceUrls.append(KUrl(metaIt.value()));
}
++sourceIt;
}

4
src/infosidebarpage.cpp
View File

@ -448,7 +448,7 @@ void InfoSidebarPage::insertActions()
KSimpleConfig cfg(*dirIt + *entryIt, true);
cfg.setDesktopGroup();
if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
const QStringList types = cfg.readListEntry("ServiceTypes");
const QStringList types = cfg.readListEntry("ServiceTypes", ',');
for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it) {
// check whether the mime type is equal or whether the
// mimegroup (e. g. image/*) is supported
@ -493,7 +493,7 @@ void InfoSidebarPage::insertActions()
QPushButton* button = new QPushButton(submenuName, m_actionBox);
button->setFlat(true);
button->setPopup(popup);
button->setMenu(popup);
button->show();
m_actionWidgets.append(button);
}

2
src/protocolcombo.cpp
View File

@ -70,7 +70,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent)
//menu->insertItems(m_protocols);
connect(menu, SIGNAL(activated(int)), this, SLOT(setProtocol(int)));
setText(protocol);
setPopup(menu);
setMenu(menu);
setFlat(true);
}

2
src/urlnavigatorbutton.cpp
View File

@ -346,7 +346,7 @@ void UrlNavigatorButton::listJobFinished(KJob* job)
setDisplayHintEnabled(PopupActiveHint, true);
update(); // ensure the button is drawn highlighted
Q3PopupMenu* dirsMenu = new Q3PopupMenu(this);
//setPopup(dirsMenu);
//setMenu(dirsMenu);
QStringList::const_iterator it = m_subdirs.constBegin();
QStringList::const_iterator itEnd = m_subdirs.constEnd();
int i = 0;