← Back to branch summary

~ubuntu-branches/ubuntu/utopic/pgadmin3/utopic-proposed

« back to all changes in this revision

Viewing changes to pgadmin/utils/sysSettings.cpp

  • Committer: Package Import Robot
  • Author(s): Christoph Berg
  • Date: 2013-09-10 16:16:38 UTC
  • mfrom: (1.3.4)
  • Revision ID: package-import@ubuntu.com-20130910161638-wwup1q553ylww7dr
Tags: 1.18.0-1
* New upstream release.
* Don't install /usr/bin/png2c anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pgadmin/utils/sysSettings.cpp
2
2
//
3
3
// pgAdmin III - PostgreSQL Tools
4
4
//
5
 
// Copyright (C) 2002 - 2012, The pgAdmin Development Team
 
5
// Copyright (C) 2002 - 2013, The pgAdmin Development Team
6
6
// This software is released under the PostgreSQL Licence
7
7
//
8
8
// sysSettings.cpp - Settings handling class
173
173
                engtype = wxT("Views");
174
174
        else if (objtype == _("External Tables"))
175
175
                engtype = wxT("External Tables");
 
176
        else if (objtype == _("Event Triggers"))
 
177
                engtype = wxT("Event Triggers");
176
178
 
177
179
        // If we just want the default, return it.
178
180
        if (GetDefault)
200
202
        else if (objtype == _("User Mappings")) engtype = wxT("User mappings");
201
203
        else if (objtype == _("Foreign Tables")) engtype = wxT("Foreign Tables");
202
204
        else if (objtype == _("Languages")) engtype = wxT("Languages");
 
205
        else if (objtype == _("Event Triggers")) engtype = wxT("Event Triggers");
203
206
        else if (objtype == _("Extensions")) engtype = wxT("Extensions");
204
207
        else if (objtype == _("Synonyms")) engtype = wxT("Synonyms");
205
208
        else if (objtype == _("Schemas")) engtype = wxT("Schemas");
451
454
        {
452
455
 
453
456
#ifdef __WXMSW__
 
457
#if wxCHECK_VERSION(2, 9, 5)
 
458
                wxStandardPaths &paths = wxStandardPaths::Get();
 
459
#else
454
460
                wxStandardPaths paths;
 
461
#endif
455
462
                deflog = paths.GetDocumentsDir();
456
463
                deflog += wxT("\\pgadmin.log");
457
464
#else
657
664
#ifdef __WXMSW__
658
665
                return wxFont(9, wxTELETYPE, wxNORMAL, wxNORMAL);
659
666
#else
 
667
#ifdef __WXGTK__
 
668
                return wxFont(10, wxTELETYPE, wxNORMAL, wxNORMAL);
 
669
#else
660
670
                return wxFont(12, wxTELETYPE, wxNORMAL, wxNORMAL);
661
671
#endif
 
672
#endif
662
673
        }
663
674
        else
664
675
                return wxFont(fontName);
705
716
{
706
717
        const wxLanguageInfo *langInfo;
707
718
 
708
 
        langInfo = wxLocale::GetLanguageInfo(Read(wxT("LanguageId"), wxLANGUAGE_UNKNOWN));
 
719
        langInfo = wxLocale::GetLanguageInfo(Read(wxT("LanguageId"), wxLANGUAGE_DEFAULT));
709
720
 
710
721
        if (langInfo)
711
722
                return langInfo->CanonicalName;
740
751
{
741
752
        if (cfgname == PGPASS)
742
753
        {
 
754
#if wxCHECK_VERSION(2, 9, 5)
 
755
                wxStandardPaths &stdp = wxStandardPaths::Get();
 
756
#else
743
757
                wxStandardPaths stdp;
 
758
#endif
744
759
                wxString fname = stdp.GetUserConfigDir();
745
760
#ifdef WIN32
746
761
                fname += wxT("\\postgresql");
770
785
{
771
786
        wxString s, tmp;
772
787
 
 
788
#if wxCHECK_VERSION(2, 9, 5)
 
789
        wxStandardPaths &stdp = wxStandardPaths::Get();
 
790
#else
773
791
        wxStandardPaths stdp;
 
792
#endif
774
793
        tmp = stdp.GetUserConfigDir();
775
794
#ifdef WIN32
776
795
        tmp += wxT("\\postgresql");
791
810
{
792
811
        wxString s, tmp;
793
812
 
 
813
#if wxCHECK_VERSION(2, 9, 5)
 
814
        wxStandardPaths &stdp = wxStandardPaths::Get();
 
815
#else
794
816
        wxStandardPaths stdp;
 
817
#endif
795
818
        tmp = stdp.GetUserConfigDir();
796
819
#ifdef WIN32
797
820
        tmp += wxT("\\postgresql");
812
835
{
813
836
        wxString s, tmp;
814
837
 
 
838
#if wxCHECK_VERSION(2, 9, 5)
 
839
        wxStandardPaths &stdp = wxStandardPaths::Get();
 
840
#else
815
841
        wxStandardPaths stdp;
 
842
#endif
816
843
        tmp = stdp.GetUserConfigDir();
817
844
#ifdef WIN32
818
845
        tmp += wxT("\\postgresql");