Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/fileaccess.h @ 77:1184fc843210
KDiff3-0.9.92
author | joachim99 |
---|---|
date | Mon, 16 Apr 2007 21:26:08 +0000 |
parents | 08ea9b86c12c |
children | fcd146072e0c |
comparison
equal
deleted
inserted
replaced
76:257ccb866dc3 | 77:1184fc843210 |
---|---|
1 /*************************************************************************** | 1 /*************************************************************************** |
2 * Copyright (C) 2003-2006 by Joachim Eibl * | 2 * Copyright (C) 2003-2007 by Joachim Eibl * |
3 * joachim.eibl at gmx.de * | 3 * joachim.eibl at gmx.de * |
4 * * | 4 * * |
5 * This program is free software; you can redistribute it and/or modify * | 5 * This program is free software; you can redistribute it and/or modify * |
6 * it under the terms of the GNU General Public License as published by * | 6 * it under the terms of the GNU General Public License as published by * |
7 * the Free Software Foundation; either version 2 of the License, or * | 7 * the Free Software Foundation; either version 2 of the License, or * |
173 { | 173 { |
174 Q_OBJECT | 174 Q_OBJECT |
175 public: | 175 public: |
176 ProgressDialog( QWidget* pParent ); | 176 ProgressDialog( QWidget* pParent ); |
177 | 177 |
178 void setStayHidden( bool bStayHidden ); | |
178 void setInformation( const QString& info, bool bRedrawUpdate=true ); | 179 void setInformation( const QString& info, bool bRedrawUpdate=true ); |
179 void setInformation( const QString& info, double dCurrent, bool bRedrawUpdate=true ); | 180 void setInformation( const QString& info, double dCurrent, bool bRedrawUpdate=true ); |
180 void setCurrent( double dCurrent, bool bRedrawUpdate=true ); | 181 void setCurrent( double dCurrent, bool bRedrawUpdate=true ); |
181 void step( bool bRedrawUpdate=true ); | 182 void step( bool bRedrawUpdate=true ); |
182 void setMaxNofSteps( int dMaxNofSteps ); | 183 void setMaxNofSteps( int dMaxNofSteps ); |
229 QTime m_t1; | 230 QTime m_t1; |
230 QTime m_t2; | 231 QTime m_t2; |
231 bool m_bWasCancelled; | 232 bool m_bWasCancelled; |
232 KIO::Job* m_pJob; | 233 KIO::Job* m_pJob; |
233 QString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time. | 234 QString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time. |
235 bool m_bStayHidden; | |
234 protected: | 236 protected: |
235 virtual void reject(); | 237 virtual void reject(); |
236 private slots: | 238 private slots: |
237 void delayedHide(); | 239 void delayedHide(); |
238 void slotAbort(); | 240 void slotAbort(); |