~ubuntu-branches/ubuntu/oneiric/notecase/oneiric

« back to all changes in this revision

Viewing changes to src/gui/ProgressDlg.cpp

Committer: Bazaar Package Importer
Author(s): Arnaud Soyez
Date: 2008-11-10 11:29:57 UTC
mfrom: (1.1.5 upstream)
Revision ID: james.westby@ubuntu.com-20081110112957-9uu6p24w7i0c7ib2

Tags: 1.9.7-0ubuntu1

* New Upstream Release
* Updated Standards-Version to 3.8.0, no changes needed.

files added:
Makefile~

po/en_GB.po

files modified:
Makefile

deb/control

debian/changelog

debian/control

docs/_build_locale.bat

docs/control

docs/help.ncd

docs/install.iss

docs/notecase.spec

po/ar.po

po/ca.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/es.po

po/et.po

po/fi.po

po/fr.po

po/fr_CA.po

po/hr.po

po/hu.po

po/id.po

po/it.po

po/ja.po

po/ko.po

po/ms.po

po/nl.po

po/no.po

po/notecase.pot

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sk.po

po/sl.po

po/sr.po

po/sv.po

po/ta.po

po/tr.po

po/zh_CN.po

po/zh_TW.po

src/AboutDlg.cpp

src/AboutDlg.h

src/DateTimeDlg.cpp

src/DateTimeDlg.h

src/DocAction.cpp

src/DocAction.h

src/DocActionAtt.cpp

src/DocActionAtt.h

src/DocActionFinish.cpp

src/DocActionFinish.h

src/DocActionFinishDel.cpp

src/DocActionFinishDel.h

src/DocActionFmt.cpp

src/DocActionFmt.h

src/DocActionPix.cpp

src/DocActionPix.h

src/DocActionSort.cpp

src/DocActionSort.h

src/EditDlg.cpp

src/EditDlg.h

src/FileAttachmentDlg.cpp

src/FileAttachmentDlg.h

src/FileExportDlg.cpp

src/FileExportDlg.h

src/FileSaveAsDlg.cpp

src/FileSaveAsDlg.h

src/FindDialog.cpp

src/FindDialog.h

src/FindReplaceDlg.cpp

src/FindReplaceDlg.h

src/FindReplaceInfo.h

src/LinkPropertiesDlg.cpp

src/LinkPropertiesDlg.h

src/MainWnd.cpp

src/MainWnd.h

src/NodePropertiesDlg.cpp

src/NodePropertiesDlg.h

src/OptionsDialog.cpp

src/OptionsDialog.h

src/PasswordDialog.h

src/PixPropertiesDlg.cpp

src/PixPropertiesDlg.h

src/PortableTrayIcon.cpp

src/PortableTrayIcon.h

src/ShortcutsList.cpp

src/ShortcutsList.h

src/ShortcutsListDlg.cpp

src/ShortcutsListDlg.h

src/TextView.cpp

src/TextView.h

src/TreeView.cpp

src/TreeView.h

src/_unx/ExecuteFile.cpp

src/_unx/SingleInstance.cpp

src/_unx/SingleInstance.h

src/_unx/eggtrayicon.cpp

src/_unx/eggtrayicon.h

src/_win/RegisterExtension.cpp

src/_win/RegisterExtension.h

src/_win/SingleInstance.h

src/_win/SingleInstanceWin.cpp

src/_win/TrayIcon.cpp

src/_win/TrayIcon.h

src/_win/bootstart.cpp

src/_win/bootstart.h

src/callbacks.cpp

src/callbacks.h

src/config.h

src/gui/FileDialog.cpp

src/gui/GuiLanguage.cpp

src/gui/ProgressDlg.cpp

src/gui/ProgressDlg.h

src/interface.cpp

src/interface.h

src/lib/Base64.cpp

src/lib/CircularBuffer.cpp

src/lib/CircularBuffer.h

src/lib/DocActionBase.h

src/lib/DocActionManager.cpp

src/lib/DocActionManager.h

src/lib/DocumentIterator.cpp

src/lib/DocumentIterator.h

src/lib/EnumDirectory.cpp

src/lib/EnumDirectory.h

src/lib/File64.cpp

src/lib/File64.h

src/lib/FilePath.cpp

src/lib/FilePath.h

src/lib/FmtInfo.cpp

src/lib/FormatIOBase.h

src/lib/FormatIOEncHtml.cpp

src/lib/FormatIOEncHtml.h

src/lib/FormatIOExecutable.cpp

src/lib/FormatIOExecutable.h

src/lib/FormatIOGjots2.cpp

src/lib/FormatIOGjots2.h

src/lib/FormatIOHtml.cpp

src/lib/FormatIOHtml.h

src/lib/FormatIOMMLX.cpp

src/lib/FormatIOMMLX.h

src/lib/FormatIOStickyNotes.cpp

src/lib/FormatIOStickyNotes.h

src/lib/FormatIOTxt.cpp

src/lib/FormatIOTxt.h

src/lib/HtmlParser.cpp

src/lib/IOLayerBase.cpp

src/lib/IOLayerBase.h

src/lib/IOLayerEnc.cpp

src/lib/IOLayerEnc.h

src/lib/IOLayerFile64.cpp

src/lib/IOLayerFile64.h

src/lib/IOLayerRedirect.h

src/lib/IOLayerZlib.cpp

src/lib/IOLayerZlib.h

src/lib/IOProcess.cpp

src/lib/IniFile.cpp

src/lib/IniFile.h

src/lib/LinkInfo.cpp

src/lib/LinkInfo.h

src/lib/NoteDocument.cpp

src/lib/NoteDocument.h

src/lib/NoteNode.cpp

src/lib/NoteNode.h

src/lib/TextSearch.cpp

src/lib/TextSearch.h

src/lib/Thread.cpp

src/lib/Thread.h

src/lib/blowfish.cpp

src/lib/blowfish.h

src/lib/blowfish2.h

src/lib/debug.cpp

src/lib/types.h

src/main.cpp

src/mru.cpp

src/mru.h

src/support.cpp

tools/NotecaseLauncher/NotecaseLauncher.cpp

Show diffs side-by-side

added added

removed removed

src/gui/ProgressDlg.cpp

static GtkWidget *g_progress1 = NULL;

bool g_bStartProgress = true;

int ProgressDlg::m_nCurrentSize = 0;

int ProgressDlg::m_nTotalSize = 0;

bool ProgressDlg::m_bCanceled = false;

static int progress_timer(gpointer data);

static int progress_start_timer(gpointer data);

static void on_abort_clicked(GtkButton *button, gpointer user_data);

ProgressDlg::ProgressDlg(int nWaitMs, const char *szTitle, GtkWidget *pParent)

ProgressDlg::ProgressDlg(int nWaitMs, const char *szTitle, GtkWidget *pParent, bool bCancelBtn)

{

if(szTitle && strlen(szTitle) > 0)

m_strTitle = szTitle;

m_nProgressTimer = 0;

m_nTotalSize = -1;

m_nCurrentSize = -1;

m_pDialog = NULL;

m_pParent = pParent;

m_bCancelBtn = bCancelBtn;

//start timer

g_bStartProgress = true;

Close();

}

void ProgressDlg::SetTotalSize(int nSize)

{

m_nTotalSize = nSize;

m_nCurrentSize = 0;

}

void ProgressDlg::SetCurrentSize(int nSize)

{

m_nCurrentSize = nSize;

}

void ProgressDlg::DoCreateWindow()

{

//show wait dialog

110

gtk_widget_show (g_progress1);

111

gtk_box_pack_start (GTK_BOX (vbox1), g_progress1, FALSE, FALSE, 3);

112

113

if(m_bCancelBtn)

114

{

115

GtkWidget *btnabort = gtk_button_new_with_mnemonic (_("Abort"));

116

gtk_widget_show (btnabort);

117

gtk_box_pack_start (GTK_BOX (vbox1), btnabort, FALSE, FALSE, 3);

118

GTK_WIDGET_SET_FLAGS (btnabort, GTK_CAN_DEFAULT);

119

g_signal_connect(btnabort, "clicked", G_CALLBACK (on_abort_clicked), this);

120

}

121

122

gtk_widget_show (msgbox);

123

gtk_widget_realize(msgbox);

124

m_pDialog = msgbox;

126

154

}

127

155

}

128

156

157

void ProgressDlg::OnCancel()

158

{

159

m_bCanceled = true;

160

Close();

161

}

162

129

163

gboolean progress_start_timer(gpointer data)

130

164

{

131

165

if(g_bStartProgress)

154

188

else

155

189

{

156

190

//ensure progress dialog is visible and pulse the progress

157

gtk_widget_show(g_wndProgressDlg);

158

if(g_progress1)

159

gtk_progress_bar_pulse(GTK_PROGRESS_BAR(g_progress1));

191

if(g_wndProgressDlg) gtk_widget_show(g_wndProgressDlg);

192

if(g_progress1){

193

if(ProgressDlg::m_nTotalSize > 0) //TOFIX what if two loads at te same time ? not static!??

194

{

195

gtk_progress_set_percentage(GTK_PROGRESS(g_progress1), ((double)ProgressDlg::m_nCurrentSize)/ProgressDlg::m_nTotalSize);

196

}

197

else

198

gtk_progress_bar_pulse(GTK_PROGRESS_BAR(g_progress1));

199

}

160

200

}

161

201

return TRUE;

162

202

}

203

204

void on_abort_clicked (GtkButton *button, gpointer user_data)

205

{

206

ProgressDlg *pDlg = (ProgressDlg *)user_data;

207

pDlg->OnCancel();

208

}

Older »