diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | core/gui.lua | 10 | ||||
| -rw-r--r-- | src/Makefile | 16 | ||||
| -rw-r--r-- | src/textadept.c | 6 |
4 files changed, 20 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b28b7df..a22fa231 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1115,7 +1115,7 @@ Changes: * Removed `_m.textadept.mlines` module since Scintilla's multiple selections supercedes it. * Removed side pane. -* New [`gui.dialog('filteredlist', ...)][] from [gcocoadialog][]. +* New [`gui.dialog('filteredlist', ...)][] from [gtdialog][]. * Can select buffer from filteredlist dialog (replacing side pane buffer list). * Can select lexer from filteredlist dialog. * Can have user `key_commands.lua`, `snippets.lua`, `mime_types.conf`, @@ -1131,7 +1131,7 @@ Changes: [Textadept 2.2 beta -- Linux]: download/textadept_2.2_beta.tgz [Textadept 2.2 beta -- Linux x86_64]: download/textadept_2.2_beta.x86_64.tgz [Textadept 2.2 beta -- Source]: download/textadept_2.2_beta.src.zip -[gcocoadialog]: http://foicica.com/gcocoadialog +[gtdialog]: http://foicica.com/gtdialog [`gui.dialog('filteredlist', ...)]: api/gui.html#dialog ## 2.1 (01 Mar 2010) @@ -1247,7 +1247,7 @@ Changes: * Sessions functionality moved to `modules/textadept/session.lua` from `core/file_io.lua`. * The `char_added` event now passes an int, not a string, to handler functions. -* Replaced [cocoaDialog][] and [lua_dialog][] with my C-based [gcocoadialog][]. +* Replaced [cocoaDialog][] and [lua_dialog][] with my C-based [gtdialog][]. * [Incremental find][] via the Lua command entry. * *NO* dependencies other than [GTK][] on _all_ platforms. @@ -1268,7 +1268,7 @@ Changes: [Scintilla]: http://scintilla.org [compile commands]: api/_M.textadept.run.html#compile_command [run commands]: api/_M.textadept.run.html#run_command -[gcocoadialog]: http://foicica.com/gcocoadialog +[gtdialog]: http://foicica.com/gtdialog [lua_dialog]: http://luaforge.net/projects/lua-dialog [cocoaDialog]: http://cocoadialog.sf.net [Incremental find]: 6_AdeptEditing.html#Find.Incremental diff --git a/core/gui.lua b/core/gui.lua index 8abe74f4..bc6f034a 100644 --- a/core/gui.lua +++ b/core/gui.lua @@ -342,7 +342,7 @@ events_connect(events.UPDATE_UI, function() local enc = buffer.encoding or '' local text = not NCURSES and '%s %d/%d %s %d %s %s %s %s' or '%s %d/%d %s %d %s %s %s %s' - gui.docstatusbar_text = string_format(text, _L['Line:'], line, max, + gui.docstatusbar_text = string_format(text, _L['Line:'], line, max, _L['Col:'], col, lexer, eol, tabs, enc) end) @@ -435,13 +435,13 @@ local size The functions below are Lua C functions. --- --- Displays a gcocoadialog of a specified type with the given string arguments. +-- Displays a gtdialog of a specified type with the given string arguments. -- Each argument is like a string in Lua's `arg` table. Tables of strings are -- allowed as arguments and are expanded in place. This is useful for -- filteredlist dialogs with many items. --- @param kind The kind of gcocoadialog. --- @param ... Parameters to the gcocoadialog. --- @return string gcocoadialog result. +-- @param kind The kind of gtdialog. +-- @param ... Parameters to the gtdialog. +-- @return string gtdialog result. -- @class function -- @name dialog local dialog diff --git a/src/Makefile b/src/Makefile index 955046b7..faf0c31d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -93,7 +93,7 @@ else SI_FLAG = endif -INCLUDEDIRS = -Iscintilla/include -I$(LUADIR)/src -Igcocoadialog +INCLUDEDIRS = -Iscintilla/include -I$(LUADIR)/src -Igtdialog ifdef NCURSES INCLUDEDIRS += -Iscintilla/term -Itermkey endif @@ -121,9 +121,9 @@ endif ifdef OSX GTKLIBS += -framework Cocoa -lgtkmacintegration endif -GCDFLAGS = $(PLAT_FLAGS) -DNOHELP -DLIBRARY +GTDFLAGS = $(PLAT_FLAGS) -DNOHELP -DLIBRARY ifndef NCURSES -GCDFLAGS += $(GTKFLAGS) +GTDFLAGS += $(GTKFLAGS) endif ifndef NCURSES LIBS = $(GTKLIBS) @@ -140,7 +140,7 @@ LUA_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o \ lpeg.o lfs.o LUA_SRCS = lua/src/*.c lua/src/lib/*.c LUAJIT_OBJS = -GCOCOADIALOG = gcocoadialog.o +GTDIALOG = gtdialog.o ifdef NCURSES TERMKEY_OBJS = termkey.o driver-ti.o driver-csi.o endif @@ -204,13 +204,13 @@ endif $(LUAJIT_OBJS): cd luajit && make $(LUAJIT_MAKE) cp luajit/src/$(LUAJIT_LIB) . -$(GCOCOADIALOG): gcocoadialog/gcocoadialog.c - $(CC) $(GCDFLAGS) $(INCLUDEDIRS) -c $< +$(GTDIALOG): gtdialog/gtdialog.c + $(CC) $(GTDFLAGS) $(INCLUDEDIRS) -c $< $(TERMKEY_OBJS): termkey/*.c $(CC) -std=c99 -c $^ $(TEXTADEPT):\ $(SCINTILLA_OBJS) $(SCINTILLA_PLAT_OBJS) $(SCINTILLA_LEXER) \ - $(TEXTADEPT_OBJS) $(LUA_OBJS) $(LUAJIT_OBJS) $(GCOCOADIALOG) \ + $(TEXTADEPT_OBJS) $(LUA_OBJS) $(LUAJIT_OBJS) $(GTDIALOG) \ $(TERMKEY_OBJS) $(TEXTADEPT_RC) $(CPP) $(EXPORTLUASYMS) -o $@ $^ $(LIBS) $(LDL) mv $(TEXTADEPT) ../ @@ -313,7 +313,7 @@ release: ../$(TEXTADEPT) ../$(TEXTADEPT32) ../$(TEXTADEPTWIN32) \ rm -r $(RELEASEDIRMAC) # Source rm $(RELEASEDIR32)/{$(TEXTADEPT),$(TEXTADEPTJIT)} - cp -rL lua luajit scintilla gcocoadialog LexLPeg.cxx $(RELEASEDIR32)/src/ + cp -rL lua luajit scintilla gtdialog LexLPeg.cxx $(RELEASEDIR32)/src/ cd $(RELEASEDIR32)/src/luajit && make clean && cd ../../../ rm -r $(RELEASEDIR32)/src/scintilla/.hg zip -r $(SRCPACKAGE) $(RELEASEDIR32) diff --git a/src/textadept.c b/src/textadept.c index f7feb13f..fd7ab229 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -25,7 +25,7 @@ #define PLAT_TERM 1 #endif -#include "gcocoadialog.h" +#include "gtdialog.h" #include "lua.h" #include "lualib.h" #include "lauxlib.h" @@ -466,7 +466,7 @@ static int lce__newindex(lua_State *L) { /** `gui.dialog()` Lua function. */ static int lgui_dialog(lua_State *L) { - GCDialogType type = gcocoadialog_type(luaL_checkstring(L, 1)); + GTDialogType type = gtdialog_type(luaL_checkstring(L, 1)); int i, j, k, n = lua_gettop(L) - 1, argc = n; for (i = 2; i < n + 2; i++) if (lua_istable(L, i)) argc += lua_rawlen(L, i) - 1; @@ -481,7 +481,7 @@ static int lgui_dialog(lua_State *L) { } } else argv[i++] = luaL_checkstring(L, j); argv[argc] = 0; - char *out = gcocoadialog(type, argc, argv); + char *out = gtdialog(type, argc, argv); lua_pushstring(L, out); free(out), free(argv); return 1; |