Menu
▾
▴
[Basket-devel] [PATCH] porting kprogress :
|
From: perihelion <per...@fr...> - 2008-06-01 00:44:56
|
change KProgress by QProgressBar or KProgressDialog
change progress->advance(step) by progress->advance(progress->value()+step)
like define on the "Porting to Qt 4" page
---
basket.kdevelop | 293 -------------------------------------------------------
src/archive.cpp | 3 +-
src/archive.h | 2 +-
3 files changed, 2 insertions(+), 296 deletions(-)
delete mode 100644 basket.kdevelop
diff --git a/basket.kdevelop b/basket.kdevelop
deleted file mode 100644
index aef6a95..0000000
--- a/basket.kdevelop
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
- <general>
- <author>Sébastien Laoût</author>
- <email>sl...@li...</email>
- <version>1.0.2</version>
- <projectmanagement>KDevKDEAutoProject</projectmanagement>
- <primarylanguage>C++</primarylanguage>
- <keywords>
- <keyword>C++</keyword>
- <keyword>Code</keyword>
- <keyword>Qt</keyword>
- <keyword>KDE</keyword>
- </keywords>
- <projectdirectory>.</projectdirectory>
- <absoluteprojectpath>false</absoluteprojectpath>
- <description>Taking care of your ideas.</description>
- <ignoreparts>
- <part>kdevfileview</part>
- <part>kdevfileselector</part>
- </ignoreparts>
- <secondaryLanguages/>
- <versioncontrol>kdevsubversion</versioncontrol>
- <projectname>basket</projectname>
- <defaultencoding/>
- </general>
- <kdevautoproject>
- <general>
- <activetarget>src/basket</activetarget>
- <useconfiguration>debug</useconfiguration>
- </general>
- <run>
- <mainprogram>/home/seb/Programmation/basket/debug/src/.libs/basket</mainprogram>
- <directoryradio>build</directoryradio>
- <customdirectory>/</customdirectory>
- <programargs>--nofork --use-drkonquy --data-folder ~/.kde/share/apps/basket-debug</programargs>
- <terminal>false</terminal>
- <autocompile>true</autocompile>
- <envvars>
- <envvar value="en_US" name="KDE_LANG" />
- <envvar value="$HOME/kde-debug/lib:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" />
- <envvar value="$HOME/kde-debug:$PATH" name="PATH" />
- </envvars>
- <runarguments>
- <basket/>
- </runarguments>
- <globaldebugarguments/>
- <globalcwd>/home/seb/Programmation/basket/debug</globalcwd>
- <useglobalprogram>true</useglobalprogram>
- <autoinstall>false</autoinstall>
- <autokdesu>false</autokdesu>
- </run>
- <configurations>
- <optimized>
- <builddir>optimized</builddir>
- <ccompiler>GccOptions</ccompiler>
- <cxxcompiler>GppOptions</cxxcompiler>
- <f77compiler>G77Options</f77compiler>
- <cxxflags>-O2 -g0</cxxflags>
- </optimized>
- <debug>
- <configargs>--enable-debug=full --without-arts --prefix=$HOME/kde-debug</configargs>
- <builddir>debug</builddir>
- <ccompiler>kdevgccoptions</ccompiler>
- <cxxcompiler>kdevgppoptions</cxxcompiler>
- <f77compiler>kdevpgf77options</f77compiler>
- <cxxflags>-O0 -g3</cxxflags>
- <topsourcedir/>
- <cppflags/>
- <ldflags/>
- <ccompilerbinary/>
- <cxxcompilerbinary/>
- <f77compilerbinary/>
- <cflags/>
- <f77flags/>
- <envvars/>
- </debug>
- </configurations>
- <make>
- <envvars>
- <envvar value="1" name="WANT_AUTOCONF_2_5" />
- <envvar value="1" name="WANT_AUTOMAKE_1_6" />
- </envvars>
- <abortonerror>true</abortonerror>
- <numberofjobs>1</numberofjobs>
- <dontact>false</dontact>
- <makebin/>
- <prio>0</prio>
- <runmultiplejobs>false</runmultiplejobs>
- </make>
- </kdevautoproject>
- <kdevfileview>
- <groups>
- <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
- <group pattern="*.ui" name="User Interface" />
- <group pattern="*.png" name="Icons" />
- <group pattern="*.po;*.ts" name="Translations" />
- <group pattern="*" name="Others" />
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <hidenonlocation>false</hidenonlocation>
- </groups>
- <tree>
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <showvcsfields>false</showvcsfields>
- <hidepatterns>*.o,*.lo,CVS</hidepatterns>
- </tree>
- </kdevfileview>
- <kdevdoctreeview>
- <ignoretocs>
- <toc>gtk</toc>
- <toc>gnustep</toc>
- <toc>python</toc>
- <toc>php</toc>
- <toc>perl</toc>
- <toc>ada</toc>
- <toc>ada_bugs_gcc</toc>
- <toc>bash_bugs</toc>
- <toc>bash</toc>
- <toc>gnome1</toc>
- <toc>gtk_bugs</toc>
- <toc>haskell</toc>
- <toc>haskell_bugs_ghc</toc>
- <toc>java_bugs_gcc</toc>
- <toc>java_bugs_sun</toc>
- <toc>opengl</toc>
- <toc>pascal_bugs_fp</toc>
- <toc>perl_bugs</toc>
- <toc>php_bugs</toc>
- <toc>python_bugs</toc>
- <toc>ruby</toc>
- <toc>ruby_bugs</toc>
- <toc>sdl</toc>
- <toc>stl</toc>
- <toc>sw</toc>
- <toc>wxwindows_bugs</toc>
- </ignoretocs>
- <projectdoc>
- <userdocDir>html/</userdocDir>
- <apidocDir>html/</apidocDir>
- </projectdoc>
- <ignoreqt_xml/>
- <ignoredoxygen/>
- <ignorekdocs/>
- <ignoredevhelp>
- <toc>atk</toc>
- <toc>gdk</toc>
- <toc>libgimpbase</toc>
- <toc>libgimpcolor</toc>
- <toc>libgimp</toc>
- <toc>libgimpmath</toc>
- <toc>libgimpmodule</toc>
- <toc>libgimpwidgets</toc>
- <toc>glib</toc>
- <toc>gobject</toc>
- <toc>gtk</toc>
- <toc>pango</toc>
- <toc>gdk-pixbuf</toc>
- </ignoredevhelp>
- </kdevdoctreeview>
- <kdevdebugger>
- <general>
- <dbgshell>libtool</dbgshell>
- <programargs>-d --nofork --use-drkonquy --data-folder ~/.kde/share/apps/basket-debug</programargs>
- <gdbpath/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
- <breakonloadinglibs>true</breakonloadinglibs>
- <separatetty>false</separatetty>
- <floatingtoolbar>false</floatingtoolbar>
- </general>
- <display>
- <staticmembers>true</staticmembers>
- <demanglenames>true</demanglenames>
- <outputradix>10</outputradix>
- </display>
- </kdevdebugger>
- <kdevfilecreate>
- <filetypes/>
- <useglobaltypes>
- <type ext="ui" />
- <type ext="cpp" />
- <type ext="h" />
- </useglobaltypes>
- </kdevfilecreate>
- <kdevcvs>
- <cvsoptions>-f</cvsoptions>
- <commitoptions/>
- <addoptions/>
- <logoptions/>
- <updateoptions>-dP</updateoptions>
- <removeoptions>-f</removeoptions>
- <revertoptions>-C -d -P</revertoptions>
- <diffoptions>-u3 -p</diffoptions>
- <rshoptions/>
- </kdevcvs>
- <kdevcppsupport>
- <references>
- <pcs>Qt</pcs>
- </references>
- <codecompletion>
- <includeGlobalFunctions>true</includeGlobalFunctions>
- <includeTypes>true</includeTypes>
- <includeEnums>true</includeEnums>
- <includeTypedefs>true</includeTypedefs>
- <automaticCodeCompletion>false</automaticCodeCompletion>
- <automaticArgumentsHint>true</automaticArgumentsHint>
- <automaticHeaderCompletion>true</automaticHeaderCompletion>
- <codeCompletionDelay>100</codeCompletionDelay>
- <argumentsHintDelay>100</argumentsHintDelay>
- <headerCompletionDelay>250</headerCompletionDelay>
- <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
- <completionBoxItemOrder>0</completionBoxItemOrder>
- <howEvaluationContextMenu>true</howEvaluationContextMenu>
- <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
- <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
- <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
- <processPrimaryTypes>true</processPrimaryTypes>
- <processFunctionArguments>true</processFunctionArguments>
- <preProcessAllHeaders>false</preProcessAllHeaders>
- <parseMissingHeaders>false</parseMissingHeaders>
- <resolveIncludePaths>true</resolveIncludePaths>
- <alwaysParseInBackground>true</alwaysParseInBackground>
- <usePermanentCaching>true</usePermanentCaching>
- <alwaysIncludeNamespaces>true</alwaysIncludeNamespaces>
- <includePaths>.;</includePaths>
- </codecompletion>
- <creategettersetter>
- <prefixGet/>
- <prefixSet>set</prefixSet>
- <prefixVariable>m_,_</prefixVariable>
- <parameterName>value</parameterName>
- <inlineGet>true</inlineGet>
- <inlineSet>true</inlineSet>
- </creategettersetter>
- <qt>
- <used>true</used>
- <version>3</version>
- <root>/usr/share/qt3</root>
- <includestyle>3</includestyle>
- <designerintegration>EmbeddedKDevDesigner</designerintegration>
- <qmake>/usr/bin/qmake-qt3</qmake>
- <designer>/usr/bin/designer-qt3</designer>
- <designerpluginpaths/>
- </qt>
- <splitheadersource>
- <enabled>false</enabled>
- <synchronize>true</synchronize>
- <orientation>Vertical</orientation>
- </splitheadersource>
- </kdevcppsupport>
- <cppsupportpart>
- <filetemplates>
- <interfacesuffix>.h</interfacesuffix>
- <implementationsuffix>.cpp</implementationsuffix>
- </filetemplates>
- </cppsupportpart>
- <kdevdocumentation>
- <projectdoc>
- <docsystem/>
- <docurl/>
- <usermanualurl/>
- </projectdoc>
- </kdevdocumentation>
- <dist>
- <custom>false</custom>
- <bzip>false</bzip>
- <archname>basket-%v.tar.gz</archname>
- <appname>basket</appname>
- <version>1.0.2</version>
- <release/>
- <vendor/>
- <licence/>
- <summary/>
- <group/>
- <packager/>
- <description>Taking care of your ideas.</description>
- <changelog/>
- <devpackage>false</devpackage>
- <docspackage>false</docspackage>
- <appicon>false</appicon>
- <arch>0</arch>
- <genHTML>false</genHTML>
- <useRPM>false</useRPM>
- <ftpkde>false</ftpkde>
- <appskde>false</appskde>
- <url/>
- </dist>
- <ctagspart>
- <customArguments/>
- <customTagfilePath/>
- </ctagspart>
-</kdevelop>
diff --git a/src/archive.cpp b/src/archive.cpp
index 6d40d10..8955118 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -33,6 +33,7 @@
#include <kstandarddirs.h>
#include <kapplication.h>
#include <kiconloader.h>
+#include <QProgressBar>
#include <kprogressdialog.h>
#include <kmainwindow.h>
@@ -60,7 +61,6 @@ void Archive::save(Basket *basket, bool withSubBaskets, const QString &destinati
dialog.setAutoClose(true);
dialog.show();
QProgressBar *progress = dialog.progressBar();
-
progress->setRange(0,/*Preparation:*/1 + /*Finishing:*/1 + /*Basket:*/1 + /*SubBaskets:*/(withSubBaskets ? Global::bnpView->basketCount(Global::bnpView->listViewItemForBasket(basket)) : 0));
progress->setValue(0);
@@ -75,7 +75,6 @@ void Archive::save(Basket *basket, bool withSubBaskets, const QString &destinati
tar.writeDir("baskets", "", "");
progress->setValue(progress->value()+1); // Preparation finished
-
kDebug() << "Preparation finished out of " << progress->maximum();
// Copy the baskets data into the archive:
diff --git a/src/archive.h b/src/archive.h
index 9a82371..8217191 100644
--- a/src/archive.h
+++ b/src/archive.h
@@ -31,7 +31,7 @@ class QString;
class QStringList;
class QDomNode;
class KTar;
-class KProgress;
+class QProgressBar;
/**
* @author Sébastien Laoût <sl...@li...>
--
1.5.2.4
|