Log Message:
-----------
changed font handling to accept exotic weights
Modified Files:
--------------
pgadmin3:
CHANGELOG.txt (r1.94 -> r1.95)
pgadmin3/src/include:
sysSettings.h (r1.30 -> r1.31)
pgadmin3/src/ui:
frmOptions.cpp (r1.40 -> r1.41)
pgadmin3/src/utils:
sysSettings.cpp (r1.58 -> r1.59)
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.94
retrieving revision 1.95
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.94 -r1.95
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
</ul>
<br>
<ul>
+ <li>2004-03-24 AP changed font handling to accept exotic weights
<li>2004-03-17 AP Updated sources for wx 2.5.1
<li>2004-03-17 AP Added Font Option
<li>2004-03-06 AP *** Fixed missing qtIdent for CREATE DATABASE TEMPLATE option
Index: sysSettings.h
===================================================================
RCS file: /projects/pgadmin3/src/include/sysSettings.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lsrc/include/sysSettings.h -Lsrc/include/sysSettings.h -u -w -r1.30 -r1.31
--- src/include/sysSettings.h
+++ src/include/sysSettings.h
@@ -101,10 +101,10 @@
bool GetUnicodeFile() const { return unicodeFile; }
void SetUnicodeFile(const bool b) {unicodeFile = b; }
- wxFont GetSQLFont() const { return wxFont(sqlFontPointSize, sqlFontFamily,
sqlFontStyle, sqlFontWeight, false, sqlFontFace); }
+ wxFont GetSQLFont() const { return sqlFont; }
wxFont GetSystemFont() const { return systemFont; }
- void SetFont(const wxFont &font);
- void SetSQLFont(const wxFont &font);
+ void SetFont(const wxFont &font) { systemFont = font; }
+ void SetSQLFont(const wxFont &font) { sqlFont = font; }
wxString GetCanonicalLanguage() const { return canonicalLanguage; }
bool Write(const wxString &key, const wxString &value) { return
wxConfig::Write(key, value); }
@@ -129,12 +129,13 @@
wxPoint Read(const wxString& key, const wxPoint &defaultVal) const;
wxSize Read(const wxString& key, const wxSize &defaultVal) const;
+ void Save();
private:
- wxFont systemFont;
+ wxFont systemFont, sqlFont;
// Tip Of The Day
bool showTipOfTheDay;
@@ -166,11 +167,6 @@
bool doubleClickProperties;
wxString searchPath;
-
- int fontPointSize, fontFamily, fontStyle, fontWeight;
- wxString fontFace;
- int sqlFontPointSize, sqlFontFamily, sqlFontStyle, sqlFontWeight;
- wxString sqlFontFace;
};
#endif
Index: frmOptions.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmOptions.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -Lsrc/ui/frmOptions.cpp -Lsrc/ui/frmOptions.cpp -u -w -r1.40 -r1.41
--- src/ui/frmOptions.cpp
+++ src/ui/frmOptions.cpp
@@ -15,6 +15,7 @@
#include <wx/wx.h>
#include <wx/xrc/xmlres.h>
#include <wx/fontdlg.h>
+#include <wx/fontutil.h>
// App headers
#include "frmOptions.h"
@@ -122,9 +123,9 @@
cbLanguage->SetSelection(sel);
currentFont=settings->GetSystemFont();
- txtFont->SetValue(currentFont.GetFaceName() + wxT(".") +
NumToStr((long)currentFont.GetPointSize()));
+ txtFont->SetValue(currentFont.GetNativeFontInfoUserDesc());
currentSqlFont=settings->GetSQLFont();
- txtSqlFont->SetValue(currentSqlFont.GetFaceName() + wxT(".") +
NumToStr((long)currentSqlFont.GetPointSize()));
+ txtSqlFont->SetValue(currentSqlFont.GetNativeFontInfoUserDesc());
}
@@ -233,6 +234,7 @@
}
+ settings->Save();
Destroy();
}
@@ -247,7 +249,7 @@
if (dlg.ShowModal() == wxID_OK)
{
currentSqlFont=dlg.GetFontData().GetChosenFont();
- txtSqlFont->SetValue(currentSqlFont.GetFaceName() + wxT(".") +
NumToStr((long)currentSqlFont.GetPointSize()));
+ txtSqlFont->SetValue(currentSqlFont.GetNativeFontInfoUserDesc());
}
}
@@ -261,7 +263,7 @@
if (dlg.ShowModal() == wxID_OK)
{
currentFont=dlg.GetFontData().GetChosenFont();
- txtFont->SetValue(currentFont.GetFaceName() + wxT(".") +
NumToStr((long)currentFont.GetPointSize()));
+ txtFont->SetValue(currentFont.GetNativeFontInfoUserDesc());
}
}
void frmOptions::OnCancel(wxCommandEvent &ev)
Index: sysSettings.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.58 -r1.59
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -83,28 +83,20 @@
if (langInfo)
canonicalLanguage=langInfo->CanonicalName;
- Read(wxT("FontPointSize"), &fontPointSize, 0);
- Read(wxT("FontFace"), &fontFace, wxEmptyString);
- Read(wxT("FontFamily"), &fontFamily, 0);
- Read(wxT("FontStyle"), &fontStyle, 0);
- Read(wxT("FontWeight"), &fontWeight, 0);
+ wxString fontName;
+ Read(wxT("Font"), &fontName, wxEmptyString);
- if (fontFace.IsEmpty())
+ if (fontName.IsEmpty())
systemFont = wxSystemSettings::GetFont(wxSYS_ICONTITLE_FONT);
else
- systemFont = wxFont(fontPointSize, fontFamily, fontStyle, fontWeight, false,
fontFace);
+ systemFont = wxFont(fontName);
#ifdef __WXMSW__
- Read(wxT("frmQuery/FontPointSize"), &sqlFontPointSize, 9);
- Read(wxT("frmQuery/FontFace"), &sqlFontFace, wxT("Courier New"));
+ Read(wxT("frmQuery/FontFace"), &fontName, wxT("Courier New.9"));
#else
- Read(wxT("frmQuery/FontPointSize"), &sqlFontPointSize, 12);
- Read(wxT("frmQuery/FontFace"), &sqlFontFace, wxT("monospace"));
+ Read(wxT("frmQuery/Font"), &fontName, wxT("monospace 12"));
#endif
- Read(wxT("frmQuery/FontFamily"), &sqlFontFamily, wxTELETYPE);
- Read(wxT("frmQuery/FontStyle"), &sqlFontStyle, wxNORMAL);
- Read(wxT("frmQuery/FontWeight"), &sqlFontWeight, wxNORMAL);
-
+ sqlFont = wxFont(fontName);
}
@@ -112,12 +104,19 @@
{
wxLogInfo(wxT("Destroying sysSettings object and saving settings"));
// frMain size/position
+ Save();
+}
+
+void sysSettings::Save()
+{
+ Write(wxT("LogFile"), logFile);
+ Write(wxT("LogLevel"), logLevel);
- Write(wxT("ShowTipOfTheDay"), showTipOfTheDay);
Write(wxT("frmQuery/MaxRows"), maxRows);
Write(wxT("frmQuery/MaxColSize"), maxColSize);
Write(wxT("frmQuery/ExplainVerbose"), explainVerbose);
Write(wxT("frmQuery/ExplainAnalyze"), explainAnalyze);
+ Write(wxT("frmQuery/Font"), sqlFont.GetNativeFontInfoDesc());
Write(wxT("AskSaveConfirmation"), BoolToStr(askSaveConfirmation));
Write(wxT("ConfirmDelete"), BoolToStr(confirmDelete));
Write(wxT("ShowUsersForPrivileges"), BoolToStr(showUsersForPrivileges));
@@ -126,30 +125,12 @@
Write(wxT("AutoRowCount"), autoRowCountThreshold);
Write(wxT("WriteUnicodeFile"), unicodeFile);
Write(wxT("SearchPath"), searchPath);
- Write(wxT("FontPointSize"), fontPointSize);
- Write(wxT("FontFamily"), fontFamily);
- Write(wxT("FontStyle"), fontStyle);
- Write(wxT("FontWeight"), fontWeight);
-
- wxFont stdFont = wxSystemSettings::GetFont(wxSYS_ICONTITLE_FONT);
- if (fontPointSize == stdFont.GetPointSize() &&
- fontFamily == stdFont.GetFamily() &&
- fontStyle == stdFont.GetStyle() &&
- fontWeight == stdFont.GetWeight() &&
- fontFace == stdFont.GetFaceName())
- {
- Write(wxT("FontFace"), wxEmptyString);
- }
- else
- {
- Write(wxT("FontFace"), fontFace);
- }
+ wxString fontName = systemFont.GetNativeFontInfoDesc();
- Write(wxT("frmQuery/FontPointSize"), sqlFontPointSize);
- Write(wxT("frmQuery/FontFamily"), sqlFontFamily);
- Write(wxT("frmQuery/FontStyle"), sqlFontStyle);
- Write(wxT("frmQuery/FontWeight"), sqlFontWeight);
- Write(wxT("frmQuery/FontFace"), sqlFontFace);
+ if (fontName ==
wxSystemSettings::GetFont(wxSYS_ICONTITLE_FONT).GetNativeFontInfoDesc())
+ Write(wxT("Font"), wxEmptyString);
+ else
+ Write(wxT("Font"), fontName);
}
@@ -200,13 +181,13 @@
void sysSettings::SetShowTipOfTheDay(const bool newval)
{
showTipOfTheDay = newval;
-
+ Write(wxT("NextTipOfTheDay"), nextTipOfTheDay);
}
void sysSettings::SetNextTipOfTheDay(const int newval)
{
nextTipOfTheDay = newval;
- this->Write(wxT("NextTipOfTheDay"), nextTipOfTheDay);
+ Write(wxT("NextTipOfTheDay"), nextTipOfTheDay);
}
//////////////////////////////////////////////////////////////////////////
@@ -216,13 +197,11 @@
void sysSettings::SetLogFile(const wxString& newval)
{
logFile = newval;
- this->Write(wxT("LogFile"), logFile);
}
void sysSettings::SetLogLevel(const int newval)
{
logLevel = newval;
- this->Write(wxT("LogLevel"), logLevel);
}
//////////////////////////////////////////////////////////////////////////
@@ -272,7 +251,7 @@
void sysSettings::SetShowSystemObjects(const bool newval)
{
showSystemObjects = newval;
- this->Write(wxT("ShowSystemObjects"), showSystemObjects);
+ Write(wxT("ShowSystemObjects"), showSystemObjects);
}
@@ -283,7 +262,7 @@
void sysSettings::SetStickySql(const bool newval)
{
stickySql = newval;
- this->Write(wxT("StickySql"), stickySql);
+ Write(wxT("StickySql"), stickySql);
}
//////////////////////////////////////////////////////////////////////////
@@ -293,7 +272,7 @@
void sysSettings::SetDoubleClickProperties(const bool newval)
{
doubleClickProperties = newval;
- this->Write(wxT("DoubleClickProperties"), doubleClickProperties);
+ Write(wxT("DoubleClickProperties"), doubleClickProperties);
}
//////////////////////////////////////////////////////////////////////////
@@ -302,16 +281,16 @@
wxSize sysSettings::GetFrmQueryBuilderSize()
{
- int width = this->Read(wxT("frmQueryBuilder/Width"), 750);
- int height = this->Read(wxT("frmQueryBuilder/Height"), 550);
+ int width = Read(wxT("frmQueryBuilder/Width"), 750);
+ int height = Read(wxT("frmQueryBuilder/Height"), 550);
return wxSize(width, height);
}
void sysSettings::SetFrmQueryBuilderSize(wxSize size)
{
- this->Write(wxT("frmQueryBuilder/Width"), size.GetWidth());
- this->Write(wxT("frmQueryBuilder/Height"), size.GetHeight());
+ Write(wxT("frmQueryBuilder/Width"), size.GetWidth());
+ Write(wxT("frmQueryBuilder/Height"), size.GetHeight());
}
//////////////////////////////////////////////////////////////////////////
@@ -320,38 +299,14 @@
wxPoint sysSettings::GetFrmQueryBuilderPos()
{
- int top = this->Read(wxT("frmQueryBuilder/Top"), 50);
- int left = this->Read(wxT("frmQueryBuilder/Left"), 50);
+ int top = Read(wxT("frmQueryBuilder/Top"), 50);
+ int left = Read(wxT("frmQueryBuilder/Left"), 50);
return wxPoint(top, left);
}
void sysSettings::SetFrmQueryBuilderPos(wxPoint pos)
{
- this->Write(wxT("frmQueryBuilder/Top"), pos.x);
- this->Write(wxT("frmQueryBuilder/Left"), pos.y);
-}
-
-
-void sysSettings::SetFont(const wxFont &font)
-{
- fontPointSize=font.GetPointSize();
- fontFamily=font.GetFamily();
- fontStyle=font.GetStyle();
- fontWeight=font.GetWeight();
- fontFace=font.GetFaceName();
- if (fontFace.IsEmpty())
- systemFont = wxSystemSettings::GetFont(wxSYS_ICONTITLE_FONT);
- else
- systemFont = wxFont(fontPointSize, fontFamily, fontStyle, fontWeight, false,
fontFace);
-}
-
-
-void sysSettings::SetSQLFont(const wxFont &font)
-{
- sqlFontPointSize=font.GetPointSize();
- sqlFontFamily=font.GetFamily();
- sqlFontStyle=font.GetStyle();
- sqlFontWeight=font.GetWeight();
- sqlFontFace=font.GetFaceName();
+ Write(wxT("frmQueryBuilder/Top"), pos.x);
+ Write(wxT("frmQueryBuilder/Left"), pos.y);
}
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
