projects
/
irwi
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c2aeef
)
Changes for packaging, public release 0.2-2
author
Torste Aikio
<zokier@zokier.laptop>
Tue, 29 Jun 2010 12:45:08 +0000
(15:45 +0300)
committer
Torste Aikio
<zokier@zokier.laptop>
Tue, 29 Jun 2010 12:45:08 +0000
(15:45 +0300)
debian/changelog
patch
|
blob
|
history
debian/postinst
patch
|
blob
|
history
src/advsettingsdlg.cpp
patch
|
blob
|
history
src/advsettingsdlg.h
patch
|
blob
|
history
src/mainwidget.cpp
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
6ad8530
..
490423a
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,3
+1,9
@@
+irwi (0.2-2) unstable; urgency=low
+
+ * Public release
+
+ -- Torste Aikio <zokier@unknown> Tue, 29 Jun 2010 12:17:33 +0300
+
irwi (0.2-1) unstable; urgency=low
* Rewrite of the core
irwi (0.2-1) unstable; urgency=low
* Rewrite of the core
diff --git
a/debian/postinst
b/debian/postinst
index
a5bf173
..
76dfdc9
100755
(executable)
--- a/
debian/postinst
+++ b/
debian/postinst
@@
-2,3
+2,4
@@
echo 'include "/home/user/.config/irwi/lirc.conf"' >> /etc/lircd.conf
sed -i '/^include/!d' /etc/lircd.conf
echo 'include "/home/user/.config/irwi/lirc.conf"' >> /etc/lircd.conf
sed -i '/^include/!d' /etc/lircd.conf
+echo -n > /home/user/.config/irwi/irwi.conf
diff --git
a/src/advsettingsdlg.cpp
b/src/advsettingsdlg.cpp
index
4579540
..
1e7c18b
100644
(file)
--- a/
src/advsettingsdlg.cpp
+++ b/
src/advsettingsdlg.cpp
@@
-8,7
+8,7
@@
#include "advsettingsdlg.h"
#include "settingstable.h"
#include "advsettingsdlg.h"
#include "settingstable.h"
-AdvSettingsDlg::AdvSettingsDlg(QDialog *parent)
+AdvSettingsDlg::AdvSettingsDlg(QWidget *parent)
: QDialog(parent)
, layout(NULL)
, btnLayout(NULL)
: QDialog(parent)
, layout(NULL)
, btnLayout(NULL)
@@
-71,7
+71,7
@@
void AdvSettingsDlg::refreshList()
void AdvSettingsDlg::setDefaults()
{
settings->setValue("lircPort", 8765);
void AdvSettingsDlg::setDefaults()
{
settings->setValue("lircPort", 8765);
- settings->setValue("remoteName", "No remote selected");
+ settings->setValue("remoteName", "");
settings->setValue("lircConf", "/home/user/.config/irwi/lirc.conf");
settings->setValue("cmd0", "VOLUP");
settings->setValue("cmd1", "VOLDOWN");
settings->setValue("lircConf", "/home/user/.config/irwi/lirc.conf");
settings->setValue("cmd0", "VOLUP");
settings->setValue("cmd1", "VOLDOWN");
diff --git
a/src/advsettingsdlg.h
b/src/advsettingsdlg.h
index
f05bd04
..
b7b779d
100644
(file)
--- a/
src/advsettingsdlg.h
+++ b/
src/advsettingsdlg.h
@@
-14,7
+14,7
@@
class AdvSettingsDlg : public QDialog
Q_OBJECT
public:
Q_OBJECT
public:
- AdvSettingsDlg(QDialog *parent);
+ AdvSettingsDlg(QWidget *parent);
~AdvSettingsDlg();
private:
~AdvSettingsDlg();
private:
diff --git
a/src/mainwidget.cpp
b/src/mainwidget.cpp
index
6f3f33f
..
5fd823d
100644
(file)
--- a/
src/mainwidget.cpp
+++ b/
src/mainwidget.cpp
@@
-1,5
+1,6
@@
#include "mainwidget.h"
#include "settingsdlg.h"
#include "mainwidget.h"
#include "settingsdlg.h"
+#include "advsettingsdlg.h"
#include <QInputDialog>
#include <QPainter>
#include <QInputDialog>
#include <QPainter>
@@
-10,6
+11,9
@@
MainWidget::MainWidget (QWidget *parent)
: QWidget(parent)
{
MainWidget::MainWidget (QWidget *parent)
: QWidget(parent)
{
+ // reset settings to defaults
+ AdvSettingsDlg asd(this);
+
layout = new QGridLayout(this);
settings = new QSettings(this);
layout = new QGridLayout(this);
settings = new QSettings(this);