[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kgpg
From:       Jean-Baptiste Mardelle <bj () altern ! org>
Date:       2005-02-02 21:23:32
Message-ID: 20050202212332.609F11CF5D () office ! kde ! org
[Download RAW message or body]

CVS commit by mardelle: 

store font in kcfg file, default to fixed width.
CCMAIL: 76427-done@bugs.kde.org


  M +7 -0      kgpg.kcfg   1.17
  M +1 -4      kgpgeditor.cpp   1.55
  M +2 -4      kgpgoptions.cpp   1.66


--- kdeutils/kgpg/kgpgeditor.cpp  #1.54:1.55
@@ -65,9 +65,6 @@ KgpgApp::KgpgApp(QWidget *parent, const 
         initView();
 
-        KSimpleConfig *ks=new KSimpleConfig ("kgpgrc");
-        ks->setGroup("Editor");
-        slotSetFont(ks->readFontEntry("Editor_Font"));
+        slotSetFont(KGpgSettings::font());
         setupGUI(( ToolBar | Keys | StatusBar | Save | Create ), "kgpg.rc");
-        delete ks;
 
 }

--- kdeutils/kgpg/kgpg.kcfg  #1.16:1.17
@@ -174,4 +174,11 @@
     </entry>
     </group>
+
+  <group name="Text Font">
+    <entry name="Font" type="Font" key="KEditFont">
+      <label>Font</label>
+      <default code="true">KGlobalSettings::fixedFont()</default>
+    </entry>
+  </group>
     
 <group name="Key Servers">

--- kdeutils/kgpg/kgpgoptions.cpp  #1.65:1.66
@@ -65,6 +65,4 @@ kgpgOptions::kgpgOptions(QWidget *parent
 {
         ks=new KSimpleConfig ("kgpgrc");
-        ks->setGroup("Editor");
-        startFont=ks->readFontEntry("Editor_Font");
 
         defaultServerList="hkp://wwwkeys.eu.pgp.net ";
@@ -92,7 +90,7 @@ kdDebug(2100)<<"Adding pages"<<endl;
         page7=new MiscConf();
         QBoxLayout *fontLayout=new \
                QBoxLayout(page3->tabWidget3->page(1),QBoxLayout::TopToBottom,10);
-        kfc=new KFontChooser(page3->tabWidget3->page(1),0L,false,QStringList(),false);
 +        kfc=new KFontChooser(page3->tabWidget3->page(1),"kcfg_Font",false,QStringList(),false);
  fontLayout->addWidget(kfc);
-        kfc->setFont(startFont);
+
         page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding \
is not secure</b> on all file systems, and that parts of the file may have been saved \
in a temporary file or in the spooler of your printer if you previously opened it in \
an editor or tried to print it. Only works on files (not on folders).</p></qt>"));  \
page7->groupShred->adjustSize();


[prev in list] [next in list] [prev in thread] [next in thread]