[bt-devel] RFC: Remove modules installed by the native package manager

Sveinung Kvilhaugsvik sveinung84 at users.sourceforge.net
Tue Jul 7 15:36:22 MST 2009


> The bazaar repo is empty.
Strange. I had to do an --overwrite to get rid of what was already
there when I pushed again. (I took the opportunity to clean up the
history before I pushed again) I hope this doesn't mean that you don't
have access. "bzr branch
bzr://bibletime.bzr.sourceforge.net/bzrroot/bibletime/bibletime.notRemovable"
works for me at least. If it don't work for you I have also pushed to
launchpad at https://code.launchpad.net/~kvilhaugsvik/bibletime/bibletime.notRemovable

I have cleaned up the history so that the coloring is on top of my
changes. That way you can choose to only merge the one under
(containing the rest) if you don't like it. (specify "-r 1126.1.1"
when merging/branching/etc) When I merged my changes into the current
tree I was faced with the question of how to merge the entry I did to
Changelog with the current version. Of the 3 alternatives "update the
date, put it on top", "keep the date, put it on top" or "keep the
date, put it in the chronological order" I choose the last one. If
that was wrong you can merge below that (1126.1.2 includes the
coloring, 1126.1.1 is the rest) yourself or tell me how it should be
done and I'll merge again. Speaking of Changelog: Are there other
files I should do something with to have a correct commit or is a
changelog entry documentation enough?

If the changes are OK will you push them to svn (at the appropriate
time) or should I try? (If I have that access after you added me to
the project) As before the tree is a bzr co of
https://bibletime.svn.sourceforge.net/svnroot/bibletime/trunk/bibletime.
I think you can do the merge like this if everything I have done is
OK:
bzr co https://bibletime.svn.sourceforge.net/svnroot/bibletime/trunk/bibletime
# all changes to this branch will be pushed to svn on commit since it
is bound to it
bzr merge bzr://bibletime.bzr.sourceforge.net/bzrroot/bibletime/bibletime.notRemovable
bzr commit

To make it easier to reply with comments on the changes I have inlined
them (as a big change) below:

Sincerely
Sveinung Kvilhaugsvik

=== modified file 'ChangeLog'
--- ChangeLog   2009-07-05 15:17:30 +0000
+++ ChangeLog   2009-07-07 21:48:10 +0000
@@ -10,6 +10,9 @@
 2009-06-19 Gary Holmlund
        * Config Dialog does not open for first time starting of
BibleTime

+2009-06-17 Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
+        * Don't offer to remove modules BibleTime can't remove
+
 2009-06-08 Martin Gruner <mgruner at crosswire.org>
        * Require Sword 1.6.0, obsolete support code removed
        * Require CMake 2.6.0

=== modified file 'src/frontend/bookshelfmanager/removepage/btremovepage.cpp'
--- src/frontend/bookshelfmanager/removepage/btremovepage.cpp
2009-04-21 19:23:29 +0000
+++ src/frontend/bookshelfmanager/removepage/btremovepage.cpp
2009-07-07 21:48:06 +0000
@@ -117,6 +117,14 @@
                        widgetItem->setFlags(Qt::ItemIsUserCheckable |
Qt::ItemIsEnabled);
                        widgetItem->setCheckState(0, Qt::Unchecked);

+                       QString removePermission = "";
+                       if (!(QFileInfo
(mInfo->config(CSwordModuleInfo::AbsoluteDataPath))).isWritable()) {
+                           widgetItem->setDisabled(true);
+                           widgetItem->setBackgroundColor(1,
QColor("Red"));
+                           removePermission = tr("You can't remove ")
+ item->text() +
+                                                 tr(" since the user
you use can't write to ");
+                       }
+
                        //TODO: add the relevant information in to
item or tooltip
                        // (install path, is still available from some source)

@@ -124,7 +132,7 @@
                        QString toolTipText = CToolClass::moduleToolTip(mInfo);
                        widgetItem->setText(1, descr);
                        widgetItem->setToolTip(0, toolTipText);
-                       widgetItem->setToolTip(1, descr);
+                       widgetItem->setToolTip(1, removePermission + descr);
                }
        }
 }



More information about the bt-devel mailing list