kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix kurldrag according to kde4porting

Browse source 
forward port to fix bug 102506: restore kwrite window correctly

svn path=/trunk/KDE/kdebase/apps/; revision=468229
This commit is contained in:
Dominik Haumann 2005-10-07 13:38:24 +00:00
parent 7738ec74e5
commit a2d645381b
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kwrite/kwritemain.cpp
View file

@ -33,7 +33,6 @@
#include <kdeversion.h>
#include <kaboutapplication.h>
#include <dcopclient.h>
#include <kurldrag.h>
#include <kencodingfiledialog.h>
#include <kdiroperator.h>
#include <kiconloader.h>
@ -59,6 +58,7 @@
#include <kconfig.h>
#include <kdebug.h>
#include <kstringhandler.h>
#include <kxmlguifactory.h>
#include <QStackedWidget>
#include <qpainter.h>
@ -90,8 +90,6 @@ KWrite::KWrite (KTextEditor::Document *doc)
m_paShowPath(0),
m_paShowStatusBar(0)
{
setMinimumSize(200,200);
if ( !doc )
{
KTextEditor::Editor *editor = KTextEditor::EditorChooser::editor();
@ -138,12 +136,12 @@ KWrite::KWrite (KTextEditor::Document *doc)
// install a working kate part popup dialog thingy
m_view->setContextMenu ((QMenu*)(factory()->container("ktexteditor_popup", this)) );
// call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings ("MainWindow Settings");
// init with more usefull size, stolen from konq :)
if ( !initialGeometrySet() && !kapp->config()->hasGroup("MainWindow Settings"))
resize( 700, 480 );
if (!initialGeometrySet())
resize( QSize(700, 480).expandedTo(minimumSizeHint()));
// call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings ();
readConfig ();
@ -361,7 +359,8 @@ void KWrite::editToolbars()
void KWrite::dragEnterEvent( QDragEnterEvent *event )
{
event->accept(KURLDrag::canDecode(event));
KURL::List uriList = KURL::List::fromMimeData( event->mimeData() );
event->accept(!uriList.isEmpty());
}
void KWrite::dropEvent( QDropEvent *event )
@ -371,9 +370,9 @@ void KWrite::dropEvent( QDropEvent *event )
void KWrite::slotDropEvent( QDropEvent *event )
{
KURL::List textlist;
KURL::List textlist = KURL::List::fromMimeData( event->mimeData() );
if (!KURLDrag::decode(event, textlist))
if (textlist.isEmpty())
return;
for (KURL::List::Iterator i=textlist.begin(); i != textlist.end(); ++i)
@ -704,7 +703,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if (QApplication::isSessionRestored())
if (a.isSessionRestored())
{
KWrite::restore();
}