1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
diff -ru smile.ori/mainfrm.cpp smilei/mainfrm.cpp
--- smile.orig/mainfrm.cpp
+++ smile/mainfrm.cpp
@@ -187,14 +187,15 @@
QString wlpack = QLocale::system().name();
qDebug() << "LOADING LANGUAGE ... smile_" + wlpack.left(2);
QTranslator *qtTranslator = new QTranslator(this);
- if (qtTranslator->load("smile_" + wlpack.left(2), qApp->applicationDirPath()) == true )
+ if (qtTranslator->load("/usr/share/smile/translations/smile_" + wlpack.left(2), qApp->applicationDirPath()) == true )
{
qApp->installTranslator(qtTranslator);
}
else
{
- if (qtTranslator->load("smile_en", qApp->applicationDirPath()) == true )
+ if (qtTranslator->load("/usr/share/smile/translations/smile_en", qApp->applicationDirPath()) == true )
{
+ qDebug() << "LOADING FALLBACK (EN) LANGUAGE...";
qApp->installTranslator(qtTranslator);
}
}
@@ -1639,7 +1640,7 @@
void mainfrm::f_splash_load()
{
QDir tmpdir;
- tmpdir.setPath(wg_library + "/BIB_ManSlide/Eff_sup/");
+ tmpdir.setPath("/usr/share/smile/BIB_ManSlide/Eff_sup/");
QStringList filters;
filters << "*.mng" << "*.MNG" << "*.gif" << "*.GIF" << "*.png" << "*.PNG";
tmpdir.setNameFilters(filters);
@@ -1649,11 +1650,11 @@
foreach (wlfile, tmpdir.entryList(QDir::Files))
{
comboeffets->insertItem(positem, wlfile);
- comboeffets->setItemIcon(positem, QIcon(wg_library + "/BIB_ManSlide/Eff_sup/" + wlfile));
+ comboeffets->setItemIcon(positem, QIcon("/usr/share/smile/BIB_ManSlide/Eff_sup/" + wlfile));
positem++;
}
//
- tmpdir.setPath(wg_library + "/BIB_ManSlide/Luma/");
+ tmpdir.setPath("/usr/share/smile/BIB_ManSlide/Luma/");
//filters << "MINI*.png";
//tmpdir.setNameFilters(filters);
positem = 2;
@@ -1672,14 +1673,14 @@
if ( wlfile != "crossfade.png" )
{
nametra = wlfile.mid(0,wlfile.length() - 4);
- transpix.load(wg_library + "/BIB_ManSlide/Luma/" + wlfile);
+ transpix.load("/usr/share/smile/BIB_ManSlide/Luma/" + wlfile);
transpix = transpix.scaledToWidth( 128, Qt::FastTransformation );
lst_transitions->insertItem(positem,nametra);
lst_transitions->setItemIcon(positem, QIcon(transpix));
lst_transitions_2->insertItem(positem+1,nametra);
lst_transitions_2->setItemIcon(positem+1, QIcon(transpix));
- table_transitions[positem] = wg_library + "/BIB_ManSlide/Luma/" + nametra + ".png";
- loadtra.load(wg_library + "/BIB_ManSlide/Luma/" + nametra + ".png");
+ table_transitions[positem] = "/usr/share/smile/BIB_ManSlide/Luma/" + nametra + ".png";
+ loadtra.load("/usr/share/smile/BIB_ManSlide/Luma/" + nametra + ".png");
table_image_transition[positem-2] = loadtra;
++positem;
}
@@ -1895,9 +1896,9 @@
int result = QMessageBox::information(this, "SMILE", tr("Voulez vous vraiment supprimer cet effet : ") + comboeffets->currentText() , tr("Oui"), tr("Non"), 0, 1 );
if (result == 0)
{
- if ( QFile::remove(wg_library + "BIB_ManSlide/Eff_sup/" + comboeffets->currentText()) == false )
+ if ( QFile::remove("/usr/share/smile/BIB_ManSlide/Eff_sup/" + comboeffets->currentText()) == false )
{
- qDebug() << "ERROR REMOVING EFFECT FILE : " << wg_library + "BIB_ManSlide/Eff_sup/" + comboeffets->currentText();
+ qDebug() << "ERROR REMOVING EFFECT FILE : " << "/usr/share/smile/BIB_ManSlide/Eff_sup/" + comboeffets->currentText();
}
f_reload();
comboeffets->setCurrentIndex(0);
@@ -1961,7 +1962,7 @@
{
int i = wmyfic.lastIndexOf( '/' );
outfilename = wmyfic.mid(i + 1, wmyfic.length() - (i + 1));
- QFile::copy ( wmyfic, wg_library + "BIB_ManSlide/Eff_sup/" + outfilename );
+ QFile::copy ( wmyfic, "/usr/share/smile/BIB_ManSlide/Eff_sup/" + outfilename );
f_reload();
}
}
@@ -1969,7 +1970,7 @@
void mainfrm::f_reload()
{
QDir tmpdir;
- tmpdir.setPath(wg_library + "BIB_ManSlide/Eff_sup/");
+ tmpdir.setPath("/usr/share/smile/BIB_ManSlide/Eff_sup/");
QStringList filters;
filters << "*.mng" << "*.MNG" << "*.gif" << "*.GIF" << "*.png" << "*.PNG";
tmpdir.setNameFilters(filters);
@@ -1980,7 +1981,7 @@
foreach (wlfile, tmpdir.entryList(QDir::Files))
{
comboeffets->insertItem(positem, wlfile);
- comboeffets->setItemIcon(positem, QIcon(wg_library + "/BIB_ManSlide/Eff_sup/" + wlfile));
+ comboeffets->setItemIcon(positem, QIcon("/usr/share/smile/BIB_ManSlide/Eff_sup/" + wlfile));
positem++;
}
}
diff -ru smile.ori/tetrahedron.cpp smile/tetrahedron.cpp
--- smile.orig/tetrahedron.cpp
+++ smile/tetrahedron.cpp
@@ -344,7 +344,7 @@
{
iseffect = 1;
delete movie;
- movie = new QMovie(wg_tet_library + "/BIB_ManSlide/Eff_sup/" + nomeffet);
+ movie = new QMovie("/usr/share/smile/BIB_ManSlide/Eff_sup/" + nomeffet);
if ( movie->isValid() == true )
{
movie->setCacheMode( QMovie::CacheAll );
@@ -382,7 +382,7 @@
}
else
{
- qDebug() << "ERROR LOADING EFFECT TEXTURE - INIT POSITION - " << wg_tet_library + "/BIB_ManSlide/Eff_sup/" + nomeffet;
+ qDebug() << "ERROR LOADING EFFECT TEXTURE - INIT POSITION - " << "/usr/share/smile/BIB_ManSlide/Eff_sup/" + nomeffet;
}
}
}
|
GitWeb