diff --git a/desktop/qhavesex.desktop b/desktop/qhavedate.desktop
similarity index 80%
rename from desktop/qhavesex.desktop
rename to desktop/qhavedate.desktop
index 82406bf0db676232c447728fb4d3ae24c3e1eb86..fe3c230bce644c8d1d408b967433992d92b17331 100644
--- a/desktop/qhavesex.desktop
+++ b/desktop/qhavedate.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=QHavesex
+Name=QHaveDate
Comment=Optimize your probabilities to have sex on dating websites
-Exec=qhavesex
-Icon=qhavesex
+Exec=qhavedate
+Icon=qhavedate
Terminal=false
Type=Application
StartupNotify=true
diff --git a/icons/havesex.png b/icons/havedate.png
similarity index 100%
rename from icons/havesex.png
rename to icons/havedate.png
diff --git a/icons/qhavesex.png b/icons/qhavedate.png
similarity index 100%
rename from icons/qhavesex.png
rename to icons/qhavedate.png
diff --git a/man/havesex.1 b/man/havedate.1
similarity index 95%
rename from man/havesex.1
rename to man/havedate.1
index 0501ae04dabf6d524946b146b38581ecb3155877..899437364df24cb47bddf6d3e38ab69e1ec09885 100644
--- a/man/havesex.1
+++ b/man/havedate.1
@@ -1,11 +1,11 @@
-.TH HAVESEX 1 "05 February 2012" "havesex 0\&.a"
+.TH HAVEDATE 1 "03 March 2012" "havedate 0\&.b"
.SH NAME
-havesex
+havedate
.SH SYNOPSIS
-.B havesex
+.B havedate
[\-dqv] [\-b \fIbackends\fR] [\-cnfs] [\fIcommand\fR [\fIarguments\fR..]]
.br
-.B havesex
+.B havedate
[\-\-help] [\-\-version]
.SH DESCRIPTION
@@ -14,8 +14,8 @@ havesex
Console application allowing to interact with various dating websites and to optimize seduction algorithmically.
.SS Supported websites:
-* aum (“Adopte un mec” french dating website)
-.SH HAVESEX COMMANDS
+* aum ("Adopte un Mec" French dating website)
+.SH HAVEDATE COMMANDS
.TP
\fBoptim\fR [list | start | edit | stop] \fIBACKEND\fR [\fIOPTIM\fR1 [\fIOPTIM\fR2 ...]]
.br
@@ -219,7 +219,7 @@ do not display item keys
file to export result
.SH COPYRIGHT
-Copyright(C) 2010-2011 Romain Bignon
+Copyright(C) 2010-2012 Romain Bignon
.LP
For full COPYRIGHT see COPYING file with weboob package.
.LP
@@ -228,4 +228,4 @@ For full COPYRIGHT see COPYING file with weboob package.
"~/.weboob/backends"
.SH SEE ALSO
-Home page: http://weboob.org/Havesex
+Home page: http://weboob.org/applications/havedate
diff --git a/man/qhavesex.1 b/man/qhavedate.1
similarity index 79%
rename from man/qhavesex.1
rename to man/qhavedate.1
index aad85b79a807ea0543f76d79d6803d3716dd7d34..ce36994da9be70120d0b15078a073b84f7a2a27b 100644
--- a/man/qhavesex.1
+++ b/man/qhavedate.1
@@ -1,11 +1,11 @@
-.TH QHAVESEX 1 "05 February 2012" "qhavesex 0\&.a"
+.TH QHAVEDATE 1 "03 March 2012" "qhavedate 0\&.b"
.SH NAME
-qhavesex
+qhavedate
.SH SYNOPSIS
-.B qhavesex
+.B qhavedate
[\-h] [\-dqv] [\-b \fIbackends\fR] ...
.br
-.B qhavesex
+.B qhavedate
[\-\-help] [\-\-version]
.SH DESCRIPTION
@@ -14,7 +14,7 @@ qhavesex
Qt application allowing to interact with various dating websites.
.SS Supported websites:
-* aum (“Adopte un mec” french dating website)
+* aum ("Adopte un Mec" French dating website)
.SH OPTIONS
.TP
\fB\-\-version\fR
@@ -44,7 +44,7 @@ file to save logs
save every response
.SH COPYRIGHT
-Copyright(C) 2010-2011 Romain Bignon
+Copyright(C) 2010-2012 Romain Bignon
.LP
For full COPYRIGHT see COPYING file with weboob package.
.LP
@@ -53,4 +53,4 @@ For full COPYRIGHT see COPYING file with weboob package.
"~/.weboob/backends"
.SH SEE ALSO
-Home page: http://weboob.org/Qhavesex
+Home page: http://weboob.org/applications/qhavedate
diff --git a/scripts/qhavesex b/scripts/havedate
similarity index 92%
rename from scripts/qhavesex
rename to scripts/havedate
index c9226b520cda4c4b1b981f7807f65796e4f219d5..3312e9e92c14cdf1506fd7848913dc1d4fb39c49 100755
--- a/scripts/qhavesex
+++ b/scripts/havedate
@@ -20,8 +20,8 @@
# along with weboob. If not, see .
-from weboob.applications.qhavesex import QHaveSex
+from weboob.applications.havedate import HaveDate
if __name__ == '__main__':
- QHaveSex.run()
+ HaveDate.run()
diff --git a/scripts/havesex b/scripts/qhavedate
similarity index 92%
rename from scripts/havesex
rename to scripts/qhavedate
index cb5cd8a03de984be521cf896162489e12f262b9e..c4871f56c3a7822f8a7633641147305bf9e3f41b 100755
--- a/scripts/havesex
+++ b/scripts/qhavedate
@@ -20,8 +20,8 @@
# along with weboob. If not, see .
-from weboob.applications.havesex import HaveSex
+from weboob.applications.qhavedate import QHaveDate
if __name__ == '__main__':
- HaveSex.run()
+ QHaveDate.run()
diff --git a/setup.py b/setup.py
index 4c0421680408ea485530221e16c6a32c9190ea3f..1b82c5371c901383753d9e20f16277775b25d663 100755
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@ def build_qt():
extraMakeFlag = []
subprocess.check_call(['make']+extraMakeFlag+['-C','weboob/applications/qboobmsg/ui'], env=env )
- subprocess.check_call(['make']+extraMakeFlag+['-C','weboob/applications/qhavesex/ui'], env=env )
+ subprocess.check_call(['make']+extraMakeFlag+['-C','weboob/applications/qhavedate/ui'], env=env )
if sys.platform != 'win32':
subprocess.check_call(['make']+extraMakeFlag+['-C','weboob/applications/qvideoob/ui'], env=env )
subprocess.check_call(['make']+extraMakeFlag+['-C','weboob/applications/qwebcontentedit/ui'], env=env )
@@ -146,7 +146,7 @@ class Options:
packages = set(find_packages())
hildon_scripts = set(('masstransit',))
-qt_scripts = set(('qboobmsg', 'qhavesex', 'qvideoob', 'weboob-config-qt', 'qwebcontentedit', 'qflatboob'))
+qt_scripts = set(('qboobmsg', 'qhavedate', 'qvideoob', 'weboob-config-qt', 'qwebcontentedit', 'qflatboob'))
if not options.hildon:
scripts = scripts - hildon_scripts
@@ -161,8 +161,8 @@ class Options:
qt_packages = set((
'weboob.applications.qboobmsg',
'weboob.applications.qboobmsg.ui',
- 'weboob.applications.qhavesex',
- 'weboob.applications.qhavesex.ui',
+ 'weboob.applications.qhavedate',
+ 'weboob.applications.qhavedate.ui',
'weboob.applications.qvideoob',
'weboob.applications.qvideoob.ui',
'weboob.applications.qweboobcfg',
diff --git a/weboob/applications/havesex/__init__.py b/weboob/applications/havedate/__init__.py
similarity index 93%
rename from weboob/applications/havesex/__init__.py
rename to weboob/applications/havedate/__init__.py
index 19e89525d0be0137086258c6af9e97faaa30c658..93e74de20182b4366bdf6b1b2db496f813aef794 100644
--- a/weboob/applications/havesex/__init__.py
+++ b/weboob/applications/havedate/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .havesex import HaveSex
+from .havedate import HaveDate
-__all__ = ['HaveSex']
+__all__ = ['HaveDate']
diff --git a/weboob/applications/havesex/havesex.py b/weboob/applications/havedate/havedate.py
similarity index 98%
rename from weboob/applications/havesex/havesex.py
rename to weboob/applications/havedate/havedate.py
index 5808d3e1e1981fa0670e7a12557d76a35290e787..81001aaa594ce11af7eb7e9ee2f3b031db2ac44f 100644
--- a/weboob/applications/havesex/havesex.py
+++ b/weboob/applications/havedate/havedate.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright(C) 2010-2011 Romain Bignon
+# Copyright(C) 2010-2012 Romain Bignon
#
# This file is part of weboob.
#
@@ -27,7 +27,7 @@
from weboob.capabilities.contact import Contact
-__all__ = ['HaveSex']
+__all__ = ['HaveDate']
class ProfileFormatter(IFormatter):
@@ -70,10 +70,10 @@ def format_dict(self, item):
result += u'\t%s\n' % s
return result
-class HaveSex(ReplApplication):
- APPNAME = 'havesex'
+class HaveDate(ReplApplication):
+ APPNAME = 'havedate'
VERSION = '0.b'
- COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon'
+ COPYRIGHT = 'Copyright(C) 2010-2012 Romain Bignon'
DESCRIPTION = 'Console application allowing to interact with various dating websites ' \
'and to optimize seduction algorithmically.'
STORAGE_FILENAME = 'dating.storage'
diff --git a/weboob/applications/qhavedate/__init__.py b/weboob/applications/qhavedate/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e3801e349339d98330a4e5c73c7e662f5a451276
--- /dev/null
+++ b/weboob/applications/qhavedate/__init__.py
@@ -0,0 +1,3 @@
+from .qhavedate import QHaveDate
+
+__all__ = ['QHaveDate']
diff --git a/weboob/applications/qhavesex/contacts.py b/weboob/applications/qhavedate/contacts.py
similarity index 100%
rename from weboob/applications/qhavesex/contacts.py
rename to weboob/applications/qhavedate/contacts.py
diff --git a/weboob/applications/qhavesex/events.py b/weboob/applications/qhavedate/events.py
similarity index 100%
rename from weboob/applications/qhavesex/events.py
rename to weboob/applications/qhavedate/events.py
diff --git a/weboob/applications/qhavesex/main_window.py b/weboob/applications/qhavedate/main_window.py
similarity index 100%
rename from weboob/applications/qhavesex/main_window.py
rename to weboob/applications/qhavedate/main_window.py
diff --git a/weboob/applications/qhavesex/qhavesex.py b/weboob/applications/qhavedate/qhavedate.py
similarity index 89%
rename from weboob/applications/qhavesex/qhavesex.py
rename to weboob/applications/qhavedate/qhavedate.py
index 5faa5435ac4118391e4bc50c1d174041c716df4c..cbf7290971c63243f2631dd9d9b29c2b889e22d4 100644
--- a/weboob/applications/qhavesex/qhavesex.py
+++ b/weboob/applications/qhavedate/qhavedate.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright(C) 2010-2011 Romain Bignon
+# Copyright(C) 2010-2012 Romain Bignon
#
# This file is part of weboob.
#
@@ -23,10 +23,10 @@
from .main_window import MainWindow
-class QHaveSex(QtApplication):
- APPNAME = 'qhavesex'
+class QHaveDate(QtApplication):
+ APPNAME = 'qhavedate'
VERSION = '0.b'
- COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon'
+ COPYRIGHT = 'Copyright(C) 2010-2012 Romain Bignon'
DESCRIPTION = 'Qt application allowing to interact with various dating websites.'
CAPS = ICapDating
STORAGE_FILENAME = 'dating.storage'
diff --git a/weboob/applications/qhavesex/status.py b/weboob/applications/qhavedate/status.py
similarity index 100%
rename from weboob/applications/qhavesex/status.py
rename to weboob/applications/qhavedate/status.py
diff --git a/weboob/applications/qhavesex/ui/Makefile b/weboob/applications/qhavedate/ui/Makefile
similarity index 100%
rename from weboob/applications/qhavesex/ui/Makefile
rename to weboob/applications/qhavedate/ui/Makefile
diff --git a/weboob/applications/qhavesex/ui/__init__.py b/weboob/applications/qhavedate/ui/__init__.py
similarity index 100%
rename from weboob/applications/qhavesex/ui/__init__.py
rename to weboob/applications/qhavedate/ui/__init__.py
diff --git a/weboob/applications/qhavesex/ui/contact_thread.ui b/weboob/applications/qhavedate/ui/contact_thread.ui
similarity index 100%
rename from weboob/applications/qhavesex/ui/contact_thread.ui
rename to weboob/applications/qhavedate/ui/contact_thread.ui
diff --git a/weboob/applications/qhavesex/ui/contacts.ui b/weboob/applications/qhavedate/ui/contacts.ui
similarity index 100%
rename from weboob/applications/qhavesex/ui/contacts.ui
rename to weboob/applications/qhavedate/ui/contacts.ui
diff --git a/weboob/applications/qhavesex/ui/events.ui b/weboob/applications/qhavedate/ui/events.ui
similarity index 100%
rename from weboob/applications/qhavesex/ui/events.ui
rename to weboob/applications/qhavedate/ui/events.ui
diff --git a/weboob/applications/qhavesex/ui/main_window.ui b/weboob/applications/qhavedate/ui/main_window.ui
similarity index 98%
rename from weboob/applications/qhavesex/ui/main_window.ui
rename to weboob/applications/qhavedate/ui/main_window.ui
index a04160d416d188b389b7ad38b85396c258395298..24093cf13acf12ea86bfbca55fac0af3810534ae 100644
--- a/weboob/applications/qhavesex/ui/main_window.ui
+++ b/weboob/applications/qhavedate/ui/main_window.ui
@@ -11,7 +11,7 @@
- QHaveSex
+ QHaveDate
diff --git a/weboob/applications/qhavesex/ui/notes.ui b/weboob/applications/qhavedate/ui/notes.ui
similarity index 100%
rename from weboob/applications/qhavesex/ui/notes.ui
rename to weboob/applications/qhavedate/ui/notes.ui
diff --git a/weboob/applications/qhavesex/ui/profile.ui b/weboob/applications/qhavedate/ui/profile.ui
similarity index 100%
rename from weboob/applications/qhavesex/ui/profile.ui
rename to weboob/applications/qhavedate/ui/profile.ui
diff --git a/weboob/applications/qhavesex/ui/thread_message.ui b/weboob/applications/qhavedate/ui/thread_message.ui
similarity index 100%
rename from weboob/applications/qhavesex/ui/thread_message.ui
rename to weboob/applications/qhavedate/ui/thread_message.ui
diff --git a/weboob/applications/qhavesex/__init__.py b/weboob/applications/qhavesex/__init__.py
deleted file mode 100644
index 7cbfed211b9afbe9c7b9d681f2c62418ee79e7bd..0000000000000000000000000000000000000000
--- a/weboob/applications/qhavesex/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .qhavesex import QHaveSex
-
-__all__ = ['QHaveSex']