Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gproject: Rename the GProject plugin to ProjectOrganizer #178

Merged
merged 1 commit into from
Dec 18, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,6 @@ M: Enrico Trotta <[email protected]>
W:
S: Maintained

gproject
P: Jiří Techet <[email protected]>
M: Jiří Techet <[email protected]>
W: http://plugins.geany.org/gproject.html
S: Maintained

markdown
P: Matthew Brush <[email protected]>
M: Matthew Brush <[email protected]>
Expand All @@ -192,6 +186,12 @@ M:
W:
S: Orphaned

projectorganizer
P: Jiří Techet <[email protected]>
M: Jiří Techet <[email protected]>
W: http://plugins.geany.org/projectorganizer.html
S: Maintained

pohelper
P: Colomban Wendling <[email protected]>
M: Colomban Wendling <[email protected]>
Expand Down
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ if ENABLE_GENIUSPASTE
SUBDIRS += geniuspaste
endif

if ENABLE_GPROJECT
SUBDIRS += gproject
endif

if ENABLE_MARKDOWN
SUBDIRS += markdown
endif
Expand All @@ -127,6 +123,10 @@ if ENABLE_PRETTY_PRINTER
SUBDIRS += pretty-printer
endif

if ENABLE_PROJECTORGANIZER
SUBDIRS += projectorganizer
endif

if ENABLE_SCOPE
SUBDIRS += scope
endif
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ Available plugins are:
* geanysendmail -- the GeanySendmail plugin
* geanyvc -- the GeanyVC plugin
* geniuspaste -- the paste to a pastebin plugin
* gproject -- the GProject plugin
* gtkspell -- GeanyVC's spell-check support
* markdown -- the Markdown plugin
* pretty_printer -- the pretty-printer plugin
* projectorganizer -- the ProjectOrganizer plugin
* scope -- the Scope plugin
* shiftcolumn -- the ShiftColumn plugin
* spellcheck -- the spellcheck plugin
Expand Down
4 changes: 2 additions & 2 deletions build/geany-plugins.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ Section Uninstall
Delete "$INSTDIR\lib\geanysendmail.dll"
Delete "$INSTDIR\lib\geanyvc.dll"
Delete "$INSTDIR\lib\geniuspaste.dll"
Delete "$INSTDIR\lib\gproject.dll"
Delete "$INSTDIR\lib\pairtaghighlighter.dll"
Delete "$INSTDIR\lib\pohelper.dll"
Delete "$INSTDIR\lib\pretty-printer.dll"
Delete "$INSTDIR\lib\projectorganizer.dll"
Delete "$INSTDIR\lib\scope.dll"
Delete "$INSTDIR\lib\shiftcolumn.dll"
Delete "$INSTDIR\lib\spellcheck.dll"
Expand All @@ -189,7 +189,7 @@ Section Uninstall
Delete "$INSTDIR\bin\libxml2-2.dll"
Delete "$INSTDIR\bin\lua5.1.dll"

Delete "$INSTDIR\share\icons\hicolor\16x16\apps\gproject-*.png"
Delete "$INSTDIR\share\icons\hicolor\16x16\apps\prjorg-*.png"

RMDir /r "$INSTDIR\doc\plugins"
RMDir /r "$INSTDIR\lib\geany-plugins"
Expand Down
10 changes: 0 additions & 10 deletions build/gproject.m4

This file was deleted.

10 changes: 10 additions & 0 deletions build/projectorganizer.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
AC_DEFUN([GP_CHECK_PROJECTORGANIZER],
[
GP_ARG_DISABLE([ProjectOrganizer], [auto])
GP_COMMIT_PLUGIN_STATUS([ProjectOrganizer])
AC_CONFIG_FILES([
projectorganizer/Makefile
projectorganizer/src/Makefile
projectorganizer/icons/Makefile
])
])
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ GP_CHECK_GEANYSENDMAIL
GP_CHECK_GEANYVC
GP_CHECK_GEANYPG
GP_CHECK_GENIUSPASTE
GP_CHECK_GPROJECT
GP_CHECK_MARKDOWN
GP_CHECK_MULTITERM
GP_CHECK_PAIRTAGHIGHLIGHTER
GP_CHECK_POHELPER
GP_CHECK_PRETTYPRINTER
GP_CHECK_PROJECTORGANIZER
GP_CHECK_SCOPE
GP_CHECK_SHIFTCOLUMN
GP_CHECK_SPELLCHECK
Expand Down
23 changes: 0 additions & 23 deletions gproject/src/Makefile.am

This file was deleted.

12 changes: 6 additions & 6 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,6 @@ geanyvc/src/utils.c
# GeniusPaste
geniuspaste/src/geniuspaste.c

# GProject
gproject/src/gproject-main.c
gproject/src/gproject-menu.c
gproject/src/gproject-project.c
gproject/src/gproject-sidebar.c

# Markdown
markdown/src/conf.c
markdown/src/plugin.c
Expand All @@ -238,6 +232,12 @@ pretty-printer/src/PrettyPrinter.c
pretty-printer/src/PluginEntry.c
pretty-printer/src/ConfigUI.c

# ProjectOrganizer
projectorganizer/src/prjorg-main.c
projectorganizer/src/prjorg-menu.c
projectorganizer/src/prjorg-project.c
projectorganizer/src/prjorg-sidebar.c

# Scope
scope/data/scope.glade
scope/src/break.c
Expand Down
64 changes: 32 additions & 32 deletions po/be.po
Original file line number Diff line number Diff line change
Expand Up @@ -3331,7 +3331,7 @@ msgstr ""
msgid "Search for contents of clipboard"
msgstr ""

#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101
#: ../geanymacro/src/geanymacro.c:1424 ../projectorganizer/src/prjorg-sidebar.c:101
msgid "Search for:"
msgstr ""

Expand Down Expand Up @@ -3923,7 +3923,7 @@ msgid "Open a signature file"
msgstr ""

#: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456
#: ../gproject/src/gproject-sidebar.c:870
#: ../projectorganizer/src/prjorg-sidebar.c:870
msgid "Project"
msgstr "Праэкт"

Expand Down Expand Up @@ -4033,7 +4033,7 @@ msgstr "Знайсьці і праэкце"
msgid "Remove File"
msgstr "Выдаліць файл"

#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849
#: ../geanyprj/src/sidebar.c:240 ../projectorganizer/src/prjorg-sidebar.c:849
msgid "H_ide Sidebar"
msgstr "Схаваць сайдбар"

Expand Down Expand Up @@ -4599,134 +4599,134 @@ msgstr ""
msgid "_Paste it!"
msgstr ""

#: ../gproject/src/gproject-main.c:36 ../gproject/src/gproject-project.c:455
#: ../projectorganizer/src/prjorg-main.c:36 ../projectorganizer/src/prjorg-project.c:455
#, fuzzy
msgid "GProject"
msgstr "Праэкт"

#: ../gproject/src/gproject-main.c:37
#: ../projectorganizer/src/prjorg-main.c:37
msgid "Glob-pattern-based project management plugin for Geany."
msgstr ""

#: ../gproject/src/gproject-menu.c:353
#: ../projectorganizer/src/prjorg-menu.c:353
#, fuzzy
msgid "Find in Project Files"
msgstr "Знайсьці і праэкце"

#: ../gproject/src/gproject-menu.c:359
#: ../projectorganizer/src/prjorg-menu.c:359
#, fuzzy
msgid "Find in project files"
msgstr "Знайсьці і праэкце"

#: ../gproject/src/gproject-menu.c:363
#: ../projectorganizer/src/prjorg-menu.c:363
#, fuzzy
msgid "Find Project File"
msgstr "Знайсьці і праэкце"

#: ../gproject/src/gproject-menu.c:369
#: ../projectorganizer/src/prjorg-menu.c:369
#, fuzzy
msgid "Find project file"
msgstr "Знайсьці і праэкце"

#: ../gproject/src/gproject-menu.c:371
#: ../projectorganizer/src/prjorg-menu.c:371
msgid "Swap Header/Source"
msgstr ""

#: ../gproject/src/gproject-menu.c:376
#: ../projectorganizer/src/prjorg-menu.c:376
msgid "Swap header/source"
msgstr ""

#: ../gproject/src/gproject-menu.c:382
#: ../projectorganizer/src/prjorg-menu.c:382
msgid "Open Selected File (gproject)"
msgstr ""

#: ../gproject/src/gproject-project.c:406
#: ../projectorganizer/src/prjorg-project.c:406
msgid "Source patterns:"
msgstr ""

#: ../gproject/src/gproject-project.c:412
#: ../projectorganizer/src/prjorg-project.c:412
msgid ""
"Space separated list of patterns that are used to identify source files."
msgstr ""

#: ../gproject/src/gproject-project.c:417
#: ../projectorganizer/src/prjorg-project.c:417
msgid "Header patterns:"
msgstr ""

#: ../gproject/src/gproject-project.c:423
#: ../projectorganizer/src/prjorg-project.c:423
msgid ""
"Space separated list of patterns that are used to identify headers. Used "
"mainly for header/source swapping."
msgstr ""

#: ../gproject/src/gproject-project.c:429
#: ../projectorganizer/src/prjorg-project.c:429
msgid "Ignored dirs patterns:"
msgstr ""

#: ../gproject/src/gproject-project.c:435
#: ../projectorganizer/src/prjorg-project.c:435
msgid ""
"Space separated list of patterns that are used to identify directories that "
"are not scanned for source files."
msgstr ""

#: ../gproject/src/gproject-project.c:443
#: ../projectorganizer/src/prjorg-project.c:443
msgid "Generate tags for all project files"
msgstr ""

#: ../gproject/src/gproject-project.c:445
#: ../projectorganizer/src/prjorg-project.c:445
msgid ""
"Generate tag list for all project files instead of only for the currently "
"opened files. Too slow for big projects (>1000 files) and should be disabled "
"in this case."
msgstr ""

#: ../gproject/src/gproject-project.c:451
#: ../projectorganizer/src/prjorg-project.c:451
msgid ""
"Note: set the patterns of files belonging to the project under the Project "
"tab."
msgstr ""

#: ../gproject/src/gproject-sidebar.c:90
#: ../gproject/src/gproject-sidebar.c:838
#: ../projectorganizer/src/prjorg-sidebar.c:90
#: ../projectorganizer/src/prjorg-sidebar.c:838
#, fuzzy
msgid "Find File"
msgstr "Дадаць файл"

#: ../gproject/src/gproject-sidebar.c:117
#: ../projectorganizer/src/prjorg-sidebar.c:117
msgid "Search inside:"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:129
#: ../projectorganizer/src/prjorg-sidebar.c:129
msgid "C_ase sensitive"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:132
#: ../projectorganizer/src/prjorg-sidebar.c:132
msgid "Search in full path"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:745
#: ../projectorganizer/src/prjorg-sidebar.c:745
msgid "Reload all"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:754
#: ../projectorganizer/src/prjorg-sidebar.c:754
#: ../treebrowser/src/treebrowser.c:1281
msgid "Expand all"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:761
#: ../projectorganizer/src/prjorg-sidebar.c:761
#: ../treebrowser/src/treebrowser.c:1285
msgid "Collapse all"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:771
#: ../projectorganizer/src/prjorg-sidebar.c:771
msgid "Follow active editor"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:820
#: ../projectorganizer/src/prjorg-sidebar.c:820
msgid "Expand All"
msgstr ""

#: ../gproject/src/gproject-sidebar.c:829
#: ../projectorganizer/src/prjorg-sidebar.c:829
#, fuzzy
msgid "Find in Files"
msgstr "Знайсьці і праэкце"
Expand Down
Loading