Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-30 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

2019-10-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored rdpopup(1) to use the 'RDDialog' and 'RDWidget'
	base classes.
This commit is contained in:
Fred Gleason 2019-10-07 13:56:16 -04:00
parent 2c5c7886e2
commit 93e40d43df
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19172,3 +19172,6 @@
2019-10-07 Fred Gleason <fredg@paravelsystems.com> 2019-10-07 Fred Gleason <fredg@paravelsystems.com>
* Refactored rdgpimon(1) to use the 'RDDialog' and 'RDWidget' * Refactored rdgpimon(1) to use the 'RDDialog' and 'RDWidget'
base classes. base classes.
2019-10-07 Fred Gleason <fredg@paravelsystems.com>
* Refactored rdpopup(1) to use the 'RDDialog' and 'RDWidget'
base classes.

13
lib/rdfontset.cpp
View File

@ -34,6 +34,19 @@ RDFontSet::RDFontSet(const QFont &default_font,RDConfig *c)
} }
RDFontSet::RDFontSet(RDConfig *c)
{
if(c==NULL) {
font_config=rda->config();
}
else {
font_config=c;
}
MakeFonts(QFont(font_config->fontFamily(),font_config->fontDefaultSize(),
QFont::Normal));
}
QFont RDFontSet::buttonFont() const QFont RDFontSet::buttonFont() const
{ {
return font_button_font; return font_button_font;

1
lib/rdfontset.h
View File

@ -29,6 +29,7 @@ class RDFontSet
{ {
public: public:
RDFontSet(const QFont &default_font,RDConfig *c=NULL); RDFontSet(const QFont &default_font,RDConfig *c=NULL);
RDFontSet(RDConfig *c=NULL);
QFont buttonFont() const; QFont buttonFont() const;
QFont bigButtonFont() const; QFont bigButtonFont() const;
QFont subButtonFont() const; QFont subButtonFont() const;

13
utils/rdpopup/rdpopup.cpp
View File

@ -18,19 +18,16 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <stdio.h>
#include <stdlib.h>
#include <syslog.h>
#include <qapplication.h> #include <qapplication.h>
#include <qwindowsstyle.h>
#include <qmessagebox.h> #include <qmessagebox.h>
#include <qdatetime.h> #include <qwindowsstyle.h>
#include <rd.h> #include <rd.h>
#include <rdapplication.h> #include <rdapplication.h>
#include <rdcmd_switch.h> #include <rdcmd_switch.h>
#include <rdconfig.h> #include <rdconfig.h>
#include <rdfontset.h>
#include "rdpopup.h" #include "rdpopup.h"
@ -123,9 +120,9 @@ int main(int argc,char *argv[])
break; break;
} }
mb->setWindowIcon(QPixmap(rivendell_22x22_xpm)); mb->setWindowIcon(QPixmap(rivendell_22x22_xpm));
QFont font("helvetica",16,QFont::Bold);
font.setPixelSize(16); RDFontSet *fs=new RDFontSet(config);
mb->setFont(font); mb->setFont(fs->progressFont());
mb->exec(); mb->exec();
delete mb; delete mb;

2
utils/rdpopup/rdpopup.h
View File

@ -2,7 +2,7 @@
// //
// A utility for displaying messages on the desktop // A utility for displaying messages on the desktop
// //
// (C) Copyright 2009-2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2009-2019 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as