Skip to content

Commit 50b5656

Browse files
committed
quc-filter-v2: remove BitmapDir, use qrc resource file
The needed bitmap icons are compiled into the binary app. See qrc file.
1 parent f37eb4c commit 50b5656

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

qucs-filter-v2/Makefile.am

+6-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ qucsfilter_SOURCES = qf_api.cpp\
4646
qf_main.cpp\
4747
qf_settings.cpp\
4848
qf_dialog.cpp\
49-
qf_box.cpp
49+
qf_box.cpp\
50+
qrc_qucsfilter.cpp
51+
52+
53+
qrc_qucsfilter.cpp: qucsfilter.qrc
54+
$(RCC) -o $@ $<
5055

5156
nodist_qucsfilter_SOURCES = $(MOCFILES)
5257

qucs-filter-v2/qf_dialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
FilterDialog::FilterDialog (QWidget * parent) : QDialog (parent)
4242
{
4343
// set application icon
44-
///setIcon (QPixmap(QucsSettings.BitmapDir + "big.qucs.xpm"));
44+
setIcon (QPixmap(":/bitmaps/big.qucs.xpm"));
4545
setCaption("Qucs Filter " PACKAGE_VERSION);
4646

4747
all = new Q3VBoxLayout(this);

qucs-filter-v2/qf_main.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,9 @@ int main (int argc, char * argv []) {
4444
if (var != NULL) {
4545
QDir QucsDir = QDir (var);
4646
QString QucsDirStr = QucsDir.canonicalPath ();
47-
QucsSettings.BitmapDir =
48-
QDir::convertSeparators (QucsDirStr + "/share/qucs/bitmaps/");
4947
QucsSettings.LangDir =
5048
QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
5149
} else {
52-
QucsSettings.BitmapDir = BITMAPDIR;
5350
QucsSettings.LangDir = LANGUAGEDIR;
5451
}
5552

qucs-filter-v2/qf_settings.h

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ struct tQucsSettings {
2626
double atten;
2727
QFont font;
2828
QString LangDir;
29-
QString BitmapDir;
3029
QString Language;
3130
};
3231

0 commit comments

Comments
 (0)