From 97ebd4c92e0a15b091a0f6e39789f14482ab9689 Mon Sep 17 00:00:00 2001 From: lars Date: Tue, 7 Nov 2006 13:48:06 +0000 Subject: [PATCH] added: volume_mount - warning message for mounting of invalid filesystem types improved: plugin_manager - usable for the different plugin types now --- plugins/date/lang/en.hdf | 8 +-- plugins/plugin_manager/gtk-ok_nuvola.png | Bin 0 -> 2838 bytes plugins/plugin_manager/gtk-stop_nuvola.png | Bin 0 -> 2596 bytes plugins/plugin_manager/lang/en.hdf | 6 ++- plugins/plugin_manager/plugin_list.cs | 56 ++++++++++----------- plugins/volume_mount/lang/en.hdf | 11 +++- plugins/volume_mount/volume_mount.py | 5 +- plugins/volume_mount/volume_umount.cs | 2 +- 8 files changed, 48 insertions(+), 40 deletions(-) create mode 100644 plugins/plugin_manager/gtk-ok_nuvola.png create mode 100644 plugins/plugin_manager/gtk-stop_nuvola.png diff --git a/plugins/date/lang/en.hdf b/plugins/date/lang/en.hdf index df00df5..9c7ee37 100644 --- a/plugins/date/lang/en.hdf +++ b/plugins/date/lang/en.hdf @@ -22,9 +22,11 @@ Text.Months { 12 = December } -SuccessMessage.DateChanged { - Title = Date changed - Text = The date was changed successfully. +SuccessMessage { + DateChanged { + Title = Date changed + Text = The date was changed successfully. + } } WarningMessage { diff --git a/plugins/plugin_manager/gtk-ok_nuvola.png b/plugins/plugin_manager/gtk-ok_nuvola.png new file mode 100644 index 0000000000000000000000000000000000000000..b89792c253801f6ece0378138fdd41eed7ebb6cf GIT binary patch literal 2838 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 table.plugin_list { - text-align: center; - } + text-align: center; + } table.plugin_list td, table.plugin_list th { - padding-left: 5px; - padding-right: 5px; - } + padding-left: 5px; + padding-right: 5px; + } + + table.plugin_list td img { + width: 24px; + height: 24px; + } @@ -19,46 +24,37 @@ -

-

+ + + + + + + + + + - + + + - -
X-X-X- checked="checked" /> checked="checked" />

- - -

-

- - - - - - - - - - - - - -
checked="checked" />checked="checked" />

+ +

-

diff --git a/plugins/volume_mount/lang/en.hdf b/plugins/volume_mount/lang/en.hdf index c2805b0..d490880 100644 --- a/plugins/volume_mount/lang/en.hdf +++ b/plugins/volume_mount/lang/en.hdf @@ -30,7 +30,7 @@ SuccessMessage { WarningMessage { MountFailed { Title = Activation failed - Text = The encrypted filesystem could not be activated. Probably the given password was wrong. Please try again. + Text = The volume could not be activated for some reason. Sorry! } MountCryptoFailed { @@ -38,9 +38,16 @@ WarningMessage { Text = Maybe you entered the wrong password? } + InvalidContainerType { + Title = Unknown format + Text = The type of this volume ist not known. Maybe you want to initialize itfirst? + Link.Text = Format volume + Link.Rel = format_fs + } + UmountFailed { Title = Deactivation failed - Text = The encrypted filesystem could not be deactivated. Probably some files are still in use. Close all unclean programs (for example that widely used word processor). In case of emergency just shut down the CryptoBox! + Text = The volume could not be deactivated. Probably some files are still in use. In case of emergency just shut down the CryptoBox! } IsAlreadyMounted { diff --git a/plugins/volume_mount/volume_mount.py b/plugins/volume_mount/volume_mount.py index 4fc3922..9d3cbf4 100644 --- a/plugins/volume_mount/volume_mount.py +++ b/plugins/volume_mount/volume_mount.py @@ -40,8 +40,9 @@ class volume_mount(CryptoBoxPlugin.CryptoBoxPlugin): self.cbox.log.info("the device (%s) is already mounted" % self.device) return "volume_status" if self.container.getType() != self.container.Types["plain"]: - ## not a plain container - fail silently + ## not a plain container self.cbox.log.info("plugin 'volume_mount' - invalid container type") + self.hdf["Data.Warning"] = "Plugins.volume_mount.InvalidContainerType" return "volume_status" try: self.container.mount() @@ -94,7 +95,7 @@ class volume_mount(CryptoBoxPlugin.CryptoBoxPlugin): try: self.container.umount() except CBUmountError, errMsg: - self.hdf["Data.Warning"] = "InvalidType" + self.hdf["Data.Warning"] = "UmountFailed" self.cbox.log.warn("could not umount the volume (%s): %s" % (self.device, errMsg)) return "volume_status" self.cbox.log.info("successfully unmounted the container: %s" % self.device) diff --git a/plugins/volume_mount/volume_umount.cs b/plugins/volume_mount/volume_umount.cs index 6002510..457badf 100644 --- a/plugins/volume_mount/volume_umount.cs +++ b/plugins/volume_mount/volume_umount.cs @@ -5,6 +5,6 @@

-

+