--- as_slot.cpp 2003/02/13 20:41:37 1.121
+++ as_slot.cpp 2003/02/13 21:12:36 1.122
@@ -397,14 +397,10 @@
//
if (!m_pMaintable->isDirty() || nResult == 1) { // Check modification state
// Make sure we correctly get the name of the default file to open
- QString Openas = m_pPrefs->getString(TITRAQ_PREFASFILE, TITRAQ_DEFASFILE);
+ QString Openas = m_pPrefs->getString(TITRAQ_PREFASDIR, TITRAQ_DEFASDIR);
if (Openas.startsWith(TITRAQ_HOMEDIRTOK))
Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
- // Conditionally use a unique extension like '.as' if user prefers
- if (m_pPrefs->getBool(TITRAQ_PREFEXTENDON, TITRAQ_DEFEXTENDON))
- Openas += TITRAQ_FEXTENSION;
-
// This dialog asks which file the user wants to open
QString Filestring = QFileDialog::getOpenFileName(Openas,
trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"),
@@ -478,14 +474,10 @@
int nResult = 0; // For checking user's answer
// Make sure we correctly get the name of the default file to open
- QString Openas = m_pPrefs->getString(TITRAQ_PREFASFILE, TITRAQ_DEFASFILE);
+ QString Openas = m_pPrefs->getString(TITRAQ_PREFASDIR, TITRAQ_DEFASDIR);
if (Openas.startsWith(TITRAQ_HOMEDIRTOK))
Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
- // Conditionally use a unique extension like '.as' if user prefers
- if (m_pPrefs->getBool(TITRAQ_PREFEXTENDON, TITRAQ_DEFEXTENDON))
- Openas += TITRAQ_FEXTENSION;
-
// And then get the name of the selected file to save to
QString Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
if (!Filestring.isEmpty()) {
@@ -528,14 +520,10 @@
int nResult = 0; // For checking user's answer
// Make sure we correctly get the name of the default file to open
- QString Openas = m_pPrefs->getString(TITRAQ_PREFASFILE, TITRAQ_DEFASFILE);
+ QString Openas = m_pPrefs->getString(TITRAQ_PREFASDIR, TITRAQ_DEFASDIR);
if (Openas.startsWith(TITRAQ_HOMEDIRTOK))
Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
- // Conditionally use a unique extension like '.as' if user prefers
- if (m_pPrefs->getBool(TITRAQ_PREFEXTENDON, TITRAQ_DEFEXTENDON))
- Openas += TITRAQ_FEXTENSION;
-
nResult = 1; // We loop on this dialog only if an indecisive user
while (nResult > 0) { // is hesitant to overwrite a file over and over again
QString Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
@@ -1137,7 +1125,7 @@
// Set default values to appear in initialized panel widgets
pUserpanel->setAccounts(m_pPrefs->getString(TITRAQ_PREFACCOUNTS, TITRAQ_DEFACCOUNTS));
- pUserpanel->setEvents(m_pPrefs->getString(TITRAQ_PREFASFILE, TITRAQ_DEFASFILE));
+ pUserpanel->setEvents(m_pPrefs->getString(TITRAQ_PREFASDIR, TITRAQ_DEFASDIR));
pUserpanel->setUser(m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER));
pUserpanel->setHome(m_pPrefs->getString(TITRAQ_PREFHOME, TITRAQ_DEFHOME));
pUserpanel->setCorbahost(m_pPrefs->getString(TITRAQ_PREFCORBHOST, TITRAQ_DEFCORBHOST));
@@ -1185,7 +1173,7 @@
// Modal panel handler
if (pUserpanel->exec() == QDialog::Accepted) {
m_pPrefs->setString(TITRAQ_PREFACCOUNTS, pUserpanel->getAccounts());
- m_pPrefs->setString(TITRAQ_PREFASFILE, pUserpanel->getEvents());
+ m_pPrefs->setString(TITRAQ_PREFASDIR, pUserpanel->getEvents());
m_pPrefs->setString(TITRAQ_PREFUSER, pUserpanel->getUser());
m_pPrefs->setString(TITRAQ_PREFHOME, pUserpanel->getHome());
m_pPrefs->setString(TITRAQ_PREFCORBHOST, pUserpanel->getCorbahost());
|
