#1 KUPS: fixed default font

[Anonymous]

I've made the PO message in Japanese and used with
KUPS-1.0 ,but some messages did not shown.
I've made the patch to avoid default fonts problems and
works fine.

[Nobody/Anonymous]

Logged In: NO

Sorry,I forgot submit the patch.Submit again.

--- kups-1.0.orig/kups/kaddprinterwizard.cpp Thu Jan 25
22:38:53 2001
+++ ./kups-1.0/kups/kaddprinterwizard.cpp Fri Mar 1
05:55:14 2002
@@ -24,6 +24,7 @@
#include <qmessagebox.h>
#include <qwidgetstack.h>
#include <klocale.h>
+#include <kglobalsettings.h>

//#include "kups.h"
#include "kaddprinterwizard.h"
@@ -124,7 +125,7 @@
confirmPage_ = new
Kap_LastConfirmationPage(widgetStack_);
widgetStack_->addWidget(confirmPage_,ID++);

• QFont f("Helvetica", 16, QFont::Bold);

• QFont
  f(KGlobalSettings::generalFont().family(),16,QFont::Bold);
  pageTitle_ = new QLabel(this);
  pageTitle_->setFont(f);
  cancelButton_ = new QPushButton(i18n("Cancel"),
  this, "CancelButton");
  --- kups-1.0.orig/kups/kap_moreinfopage.h Sat Jan 6
  18:46:10 2001
  +++ kups-1.0/kups/kap_moreinfopage.h Mon Apr 22 00:15:03 2002
  @@ -16,8 +16,8 @@

  void setNumberOfInfos(int n);
  

• void setLabel(int i, const char *txt);

• void setText(int i, const char *txt);
• void setLabel(int i, const QString& txt);
• void setText(int i, const QString& txt);
  const char text(int i);
  const char label(int i);

--- kups-1.0.orig/kups/kap_moreinfopage.cpp Sat Jan 6
18:46:10 2001
+++ kups-1.0/kups/kap_moreinfopage.cpp Mon Apr 22 00:15:34 2002
@@ -42,12 +42,12 @@
resizeEvent(0);
}

-void Kap_MoreInfoPage::setLabel(int i, const char *txt)
+void Kap_MoreInfoPage::setLabel(int i, const QString& txt)
{
if (i >= 0 && i < n_) labellist_.at(i)->setText(txt);
}

-void Kap_MoreInfoPage::setText(int i, const char *txt)
+void Kap_MoreInfoPage::setText(int i, const QString& txt)
{
if (i >= 0 && i < n_) editlist_.at(i)->setText(txt);
}
--- kups-1.0.orig/kups/kaddprinterwizard.cpp Fri Mar 29
02:28:10 2002
+++ kups-1.0/kups/kaddprinterwizard.cpp Mon Apr 22 01:14:49 2002
@@ -271,7 +271,7 @@
QString msg;
if (!currentPage_->canNextPage(msg))
{
- if (!msg.isEmpty())
QMessageBox::information(this,i18n("Continue
request"),msg.data(),QMessageBox::Ok|QMessa
geBox::Default,0);
+ if (!msg.isEmpty())
QMessageBox::information(this,i18n("Continue
request"),msg,QMessageBox::Ok|QMessageBox::
Default,0);
return;
}
msg = "";