summaryrefslogtreecommitdiffstats
path: root/twin/data
diff options
context:
space:
mode:
Diffstat (limited to 'twin/data')
-rw-r--r--twin/data/CMakeLists.txt12
-rw-r--r--twin/data/Makefile.am4
-rw-r--r--twin/data/fsp_workarounds_1.twinrules31
-rw-r--r--twin/data/twin3_plugin.pl8
-rw-r--r--twin/data/twin3_plugin.upd4
-rw-r--r--twin/data/update_default_rules.cpp4
-rw-r--r--twin/data/update_window_settings.cpp18
7 files changed, 20 insertions, 61 deletions
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 9a0ce88da..df0b79f88 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -22,22 +22,24 @@ link_directories(
##### other data ################################
install( FILES
- twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
+ twin.upd twinsticky.upd twiniconify.upd
twin_focus1.upd twinupdatewindowsettings.upd
twin_focus2.upd twin_fsp_workarounds_1.upd
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS
- pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+ pluginlibFix.pl twin_focus1.sh twin_focus2.sh
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES
pop.wav
DESTINATION ${SOUND_INSTALL_DIR} )
-install( FILES
- fsp_workarounds_1.twinrules
- DESTINATION ${DATA_INSTALL_DIR}/twin/default_rules )
+tde_create_translated_desktop(
+ SOURCE fsp_workarounds_1.twinrules
+ DESTINATION ${DATA_INSTALL_DIR}/twin/default_rules
+ PO_DIR twin-desktops
+)
##### twin_update_window_settings (executable) ##
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 0a2dab482..64ce6ab81 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -16,9 +16,9 @@ METASOURCES = AUTO
sounddir= $(kde_sounddir)
sound_DATA = pop.wav
-update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
+update_DATA = twin.upd twinsticky.upd twiniconify.upd twin_focus1.upd \
twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
-update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+update_SCRIPTS = pluginlibFix.pl twin_focus1.sh twin_focus2.sh
updatedir = $(kde_datadir)/tdeconf_update
twin_default_rules_DATA = fsp_workarounds_1.twinrules
diff --git a/twin/data/fsp_workarounds_1.twinrules b/twin/data/fsp_workarounds_1.twinrules
index c5be36548..2d8a5f158 100644
--- a/twin/data/fsp_workarounds_1.twinrules
+++ b/twin/data/fsp_workarounds_1.twinrules
@@ -1,36 +1,5 @@
[1]
Description=(Default) Disable focus stealing prevention for XV
-Description[bg]=(По подразбиране) Изключване открадването на фокуса за XV
-Description[ca]=(Omissió) Desactiva la prevenció del robatori de focus pel XV
-Description[da]=(Standard) Deaktivér forhindring af at stjæle fokus for XV
-Description[de]=(Voreinstellung) Vorbeugung gegen Fokusverlust für XV
-Description[el]=(Προκαθορισμένο) Απενεργοποίηση αποτροπής κλεψίματος εστίασης για το XV
-Description[eo]=(Defaŭlta) Malebligu la preventon de fokus-elprenado por XV
-Description[es]=(Predefinido) Deshabilitar la prevención de robo del foco para XV
-Description[et]=(Vaikimisi) keelatakse XV fookuse röövimise vältimine
-Description[fr]=(Défaut) Désactive le vol du focus pour XV
-Description[fy]=(standert) Foarkomme fan ôfpakke fan toetseboerdfokus foar XV
-Description[hr]=(Zadano) Onemogući sprečavanje preuzimanja fokusa za XV
-Description[hu]=(Alapértelmezés) A fókuszelvételi védelem kikapcsolása az XV-nél
-Description[is]=(Sjálfgefið) Aftengja vörn gegn fókusþjófnaði fyrir XV
-Description[it]=(Predefinita) Disabilita la prevenzione della cattura del fuoco per XV
-Description[ja]=(デフォルト) XV のフォーカス移動防止を無効にする
-Description[km]=(លំនាំដើម) បិទ​ការ​ផ្ដោតអារម្មណ៍ ដោយ​លួច​ការពារ​សម្រាប់ XV
-Description[ko]=(기본값) XV의 초점 뺏아가기 막기 사용하지 않기
-Description[nb]=(Standard) Slå av fokusoverstyring fra XV
-Description[nds]=(Standard) För XV de Fokusverleer-Schuul utmaken
-Description[nl]=(Standaard) Voorkomen van afpakken toetsenbordfocus voor XV
-Description[pl]=(Domyślne) wyłączenie przechwytywania aktywności dla XV
-Description[pt]=(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV
-Description[pt_BR]=(Padrão) Desativa prevenção de roubo de foco para o XV
-Description[ru]=(по умолчанию) отключить предотвращение потери для XV
-Description[sk]=(Štandard) Znemožniť kradnutie aktivity okna XV
-Description[sl]=(privzeto) Onemogoči preprečevanje kraje fokusa za XV
-Description[sr]=(Подразумевано) Искључи спречавање преузимања фокуса за XV
-Description[sr@Latn]=(Podrazumevano) Isključi sprečavanje preuzimanja fokusa za XV
-Description[sv]=(Förval) Inaktivera möjlighet att förhindra stöld av fokus för XV
-Description[wa]=(Prémetou) Dismete li hapaedje di focus po XV
-Description[zh_TW]=(預設)為 XV 關閉避免焦點被偷的功能
fsplevel=0
fsplevelrule=2
wmclass=^xv .*
diff --git a/twin/data/twin3_plugin.pl b/twin/data/twin3_plugin.pl
deleted file mode 100644
index f5234bcce..000000000
--- a/twin/data/twin3_plugin.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-foreach (<>) {
- if(/^PluginLib=twin_(.*)$/) {
- print "PluginLib=twin3_$1\n";
- next;
- }
- print $_;
-}
diff --git a/twin/data/twin3_plugin.upd b/twin/data/twin3_plugin.upd
deleted file mode 100644
index 7194b5641..000000000
--- a/twin/data/twin3_plugin.upd
+++ /dev/null
@@ -1,4 +0,0 @@
-Id=trinity.2
-File=twinrc
-Options=overwrite
-Script=twin3_plugin.pl,perl
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 1afde0bee..c37abc81d 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -13,8 +13,8 @@ License. See the file "COPYING" for the exact licensing terms.
#include <dcopclient.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdeinstance.h>
+#include <tdestandarddirs.h>
int main( int argc, char* argv[] )
{
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index e52f8c760..d4b525691 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <netwm_def.h>
#include <tdeconfig.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <dcopclient.h>
struct SessionInfo
@@ -82,14 +82,14 @@ void loadFakeSessionInfo( TDEConfig* config )
info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
- info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
- info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
- info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
- info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE );
- info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE );
- info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE );
- info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE );
- info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE );
+ info->minimized = config->readBoolEntry( TQString("iconified")+n, false );
+ info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false );
+ info->shaded = config->readBoolEntry( TQString("shaded")+n, false );
+ info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false );
+ info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false );
+ info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false );
+ info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false );
+ info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false );
info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
info->active = false;
info->fake = true;