summaryrefslogtreecommitdiff
path: root/lib/dialogues
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2018-05-08 16:00:42 +0200
committerAndrej Shadura <andrewsh@debian.org>2018-05-08 16:00:42 +0200
commit2fc4dd61e5607569909548975eaf54cef87be96e (patch)
tree19417eb5639eacffcfac6d9de53e0ab464010503 /lib/dialogues
parent47aa8b00b2b11df13a100489e0f904a4947177ef (diff)
New upstream version 1.4.9
Diffstat (limited to 'lib/dialogues')
-rw-r--r--lib/dialogues/errorhandler.tcl8
-rw-r--r--lib/dialogues/fsd.tcl27
-rw-r--r--lib/dialogues/my_tk_messageBox.tcl10
-rw-r--r--lib/dialogues/selectmcu.tcl25
-rw-r--r--lib/dialogues/tips.tcl5
5 files changed, 49 insertions, 26 deletions
diff --git a/lib/dialogues/errorhandler.tcl b/lib/dialogues/errorhandler.tcl
index 93e1cf4..e829e9d 100644
--- a/lib/dialogues/errorhandler.tcl
+++ b/lib/dialogues/errorhandler.tcl
@@ -1,10 +1,13 @@
#!/usr/bin/tclsh
-# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net )
+# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide )
############################################################################
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera #
# martin.osmera@gmail.com #
# #
+# Copyright (C) 2014 by Moravia Microsystems, s.r.o. #
+# martin.osmera@moravia-microsystems.com #
+# #
# This program is free software; you can redistribute it and#or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
@@ -122,8 +125,9 @@ namespace eval ErrorHandler {
]
# Write error message
+ $middle_frame.text insert end [mc "Program version: %s\n" "${::VERSION}"]
$middle_frame.text insert end [mc "Error log saved in: %s\n" "${::X::defaultDirectory}[file separator]mcu8051ide_errors.log"]
- $middle_frame.text insert end [mc "Please send this file to %s\nor report this bug at: http://sourceforge.net/tracker/?group_id=185864&atid=914981\n\n\n" {<martin.osmera@gmail.com>}]
+ $middle_frame.text insert end [mc "Please send this file to %s\n\n\n" {<martin.osmera@moravia-microsystems.com>}]
create_link_tag_in_text_widget $middle_frame.text
convert_all_https_to_links $middle_frame.text
$middle_frame.text tag add tag_big_bold 1.0 4.0
diff --git a/lib/dialogues/fsd.tcl b/lib/dialogues/fsd.tcl
index fce7e24..4733426 100644
--- a/lib/dialogues/fsd.tcl
+++ b/lib/dialogues/fsd.tcl
@@ -1,10 +1,13 @@
#!/usr/bin/tclsh
-# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net )
+# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide )
############################################################################
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera #
# martin.osmera@gmail.com #
# #
+# Copyright (C) 2014 by Moravia Microsystems, s.r.o. #
+# martin.osmera@moravia-microsystems.com #
+# #
# This program is free software; you can redistribute it and#or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
@@ -58,27 +61,27 @@ set _FSD_TCL _
itcl::class KIFSD::FSD {
- common bookmark_change_command {} ;# Command to invoke on bokmark change
+ public common bookmark_change_command {} ;# Command to invoke on bokmark change
# Font for quick navigation panel
- common quick_nav_panel_font [font create \
+ public common quick_nav_panel_font [font create \
-family {helvetica} \
-size [expr {int(-12 * $::font_size_factor)}] \
-weight bold \
]
# Font for files listbox in mode (Short view)
- common listbox_font_short [font create \
+ public common listbox_font_short [font create \
-family {helvetica} \
-size [expr {int(-14 * $::font_size_factor)}] \
-weight normal \
]
# Font for files listbox in mode (Detailed view) and directories listbox
- common listbox_font_detailed [font create \
+ public common listbox_font_detailed [font create \
-family $::DEFAULT_FIXED_FONT \
-size [expr {int(-12 * $::font_size_factor)}] \
-weight normal \
]
# Font for listbox header
- common listbox_header_font [font create \
+ public common listbox_header_font [font create \
-family $::DEFAULT_FIXED_FONT \
-size [expr {int(-12 * $::font_size_factor)}] \
-weight bold \
@@ -1932,13 +1935,13 @@ itcl::class KIFSD::FSD {
public method file_listbox_item_menu {x y item} {
set item_menu_request 1
set current_item $item
- set current_item_index [$dir_listbox index $item]
+ set current_item_index [$file_listbox index $item]
foreach entry {Rename Delete Properties {Bookmark folder}} {
$win.listbox_menu entryconfigure [mc $entry] -state normal
}
set cur_listbox {file}
set current_item $item
- set current_item_index [$dir_listbox index $item]
+ set current_item_index [$file_listbox index $item]
tk_popup $win.listbox_menu $x $y
}
@@ -2078,7 +2081,7 @@ itcl::class KIFSD::FSD {
# Create dialog window and Notebook
set dialog [toplevel $win.properties_dialog -class {Configuration dialog} -bg ${::COMMON_BG_COLOR}]
- set nb [NoteBook $dialog.nb -bg ${::COMMON_BG_COLOR}]
+ set nb [ModernNoteBook $dialog.nb]
$nb insert end general -text "General"
if {!$::MICROSOFT_WINDOWS} { ;# Microsoft Windows has no file rights (compatible with posix rights)
$nb insert end permission -text "Permissions"
@@ -2091,7 +2094,7 @@ itcl::class KIFSD::FSD {
# Name:
set row 0
grid [label $frame.lbl_$row \
- -text [::mc "Name:"] -anchor w \
+ -text [::mc "Name:"] -anchor w \
-font $listbox_font_short \
] -column 0 -row $row -sticky w -pady 3
set ::KIFSD::FSD::item_properties(name) $name
@@ -2186,8 +2189,8 @@ itcl::class KIFSD::FSD {
] -side left -padx 2
# Pack notebook and bottom frame
- pack $nb -fill both -expand 1 -padx 10 -pady 5
- pack $bottom_frame -anchor e -after $nb -padx 10 -pady 5
+ pack [$nb get_nb] -fill both -expand 1 -padx 10 -pady 5
+ pack $bottom_frame -anchor e -after [$nb get_nb] -padx 10 -pady 5
# Configure dialog window
wm title $dialog [::mc "Item properties"]
diff --git a/lib/dialogues/my_tk_messageBox.tcl b/lib/dialogues/my_tk_messageBox.tcl
index 0698e9e..42de741 100644
--- a/lib/dialogues/my_tk_messageBox.tcl
+++ b/lib/dialogues/my_tk_messageBox.tcl
@@ -1,10 +1,13 @@
#!/usr/bin/tclsh
-# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net )
+# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide )
############################################################################
# Copyright (C) 2009, 2010, 2011, 2012 by Martin Ošmera #
# martin.osmera@gmail.com #
# #
+# Copyright (C) 2014 by Moravia Microsystems, s.r.o. #
+# martin.osmera@moravia-microsystems.com #
+# #
# This program is free software; you can redistribute it and#or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
@@ -171,7 +174,12 @@ namespace eval my_tk_messageBox {
destroy $dialog
set ::my_tk_messageBox::return_value {}
"
+
update
+
+ if {![winfo exists $dialog]} {
+ return $return_value
+ }
catch {
grab $dialog
}
diff --git a/lib/dialogues/selectmcu.tcl b/lib/dialogues/selectmcu.tcl
index 584a59f..711b9c7 100644
--- a/lib/dialogues/selectmcu.tcl
+++ b/lib/dialogues/selectmcu.tcl
@@ -1,10 +1,13 @@
#!/usr/bin/tclsh
-# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net )
+# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide )
############################################################################
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera #
# martin.osmera@gmail.com #
# #
+# Copyright (C) 2014 by Moravia Microsystems, s.r.o. #
+# martin.osmera@moravia-microsystems.com #
+# #
# This program is free software; you can redistribute it and#or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
@@ -1392,15 +1395,17 @@ namespace eval SelectMCU {
image delete $image
}
update
- if {[catch {
- $image_label configure -text { } -image [image create photo \
- -format png -file "${::ROOT_DIRNAME}/icons/mcu/$mcu_name.png"
- ]
- }]} then {
- $image_label configure \
- -fg {#DD0000} \
- -text [mc " Image not found"] \
- -image ::ICONS::16::no
+ if {[winfo exists $image_label]} {
+ if {[catch {
+ $image_label configure -text { } -image [image create photo \
+ -format png -file "${::ROOT_DIRNAME}/icons/mcu/$mcu_name.png"
+ ]
+ }]} then {
+ $image_label configure \
+ -fg {#DD0000} \
+ -text [mc " Image not found"] \
+ -image ::ICONS::16::no
+ }
}
}
diff --git a/lib/dialogues/tips.tcl b/lib/dialogues/tips.tcl
index d2df211..469b9e1 100644
--- a/lib/dialogues/tips.tcl
+++ b/lib/dialogues/tips.tcl
@@ -1,10 +1,13 @@
#!/usr/bin/tclsh
-# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net )
+# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide )
############################################################################
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera #
# martin.osmera@gmail.com #
# #
+# Copyright (C) 2014 by Moravia Microsystems, s.r.o. #
+# martin.osmera@moravia-microsystems.com #
+# #
# This program is free software; you can redistribute it and#or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #