diff --git a/src/xschem.tcl b/src/xschem.tcl index d533963d..774bf75a 100644 --- a/src/xschem.tcl +++ b/src/xschem.tcl @@ -3087,11 +3087,11 @@ proc display {} { destroy $w.b$i } set i $c_t(top) - button $w.title -text Recent -pady 0 -padx 0 -width 7 -state disabled -disabledforeground black \ + button $w.title -text Recent -pady 0 -padx 0 -state disabled -disabledforeground black \ -background grey60 -highlightthickness 0 -borderwidth 0 -font {TkDefaultFont 12 bold} pack $w.title -side top -fill x while {1} { - button $w.b$i -text $c_t($i,text) -pady 0 -padx 0 -command $c_t($i,command) -width 7 + button $w.b$i -text $c_t($i,text) -pady 0 -padx 0 -command $c_t($i,command) pack $w.b$i -side top -fill x set i [expr {($i + 1) % $n}] if { $i == $c_t(top) } break @@ -3335,7 +3335,7 @@ proc myload_display_preview {f} { proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}} {loadfile {1}} {confirm_overwrt {1}} {initialf {}}} { global myload_index1 myload_files2 myload_files1 myload_retval myload_dir1 pathlist OS - global myload_default_geometry myload_sash_pos myload_yview tcl_version myload_globfilter myload_dir2 + global file_dialog_default_geometry myload_sash_pos myload_yview tcl_version myload_globfilter myload_dir2 global myload_save_initialfile myload_loadfile myload_ext if { [winfo exists .load] } { @@ -3360,7 +3360,7 @@ proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}} panedwindow .load.l -orient horizontal -height 8c if { $loadfile == 2} {frame .load.l.recent} frame .load.l.paneleft - eval [subst {listbox .load.l.paneleft.list -listvariable myload_files1 -width 20 -height 12 \ + eval [subst {listbox .load.l.paneleft.list -listvariable myload_files1 -width 40 -height 12 \ -yscrollcommand ".load.l.paneleft.yscroll set" -selectmode browse \ -xscrollcommand ".load.l.paneleft.xscroll set" -exportselection 0}] if { ![catch {.load.l.paneleft.list cget -justify}]} { @@ -3400,13 +3400,13 @@ proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}} pack .load.l.paneright.list -side bottom -fill both -expand true if { $loadfile == 2} { - .load.l add .load.l.recent -minsize 30 + .load.l add .load.l.recent c_toolbar::display } .load.l add .load.l.paneleft -minsize 40 .load.l add .load.l.paneright -minsize 40 - # .load.l paneconfigure .load.l.paneleft -stretch always - # .load.l paneconfigure .load.l.paneright -stretch always + .load.l paneconfigure .load.l.paneleft -stretch always + .load.l paneconfigure .load.l.paneright -stretch always frame .load.buttons frame .load.buttons_bot button .load.buttons_bot.ok -width 5 -text OK -command " @@ -3486,8 +3486,8 @@ proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}} pack .load.buttons_bot -side bottom -fill x pack .load.buttons -side bottom -fill x pack .load.l -expand true -fill both - if { [info exists myload_default_geometry]} { - wm geometry .load "${myload_default_geometry}" + if { [info exists file_dialog_default_geometry]} { + wm geometry .load "${file_dialog_default_geometry}" } myload_set_home $initdir if { $loadfile != 2} { @@ -3527,9 +3527,9 @@ proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}} .load.l.paneleft.list xview moveto 1 bind .load { set myload_sash_pos [.load.l sash coord 0] - set myload_default_geometry [wm geometry .load] + set file_dialog_default_geometry [wm geometry .load] .load.l.paneleft.list xview moveto 1 - # regsub {\+.*} $myload_default_geometry {} myload_default_geometry + # regsub {\+.*} $file_dialog_default_geometry {} file_dialog_default_geometry } bind .load.l.paneright.yscroll { diff --git a/src/xschemrc b/src/xschemrc index 7eea324c..8aff6557 100644 --- a/src/xschemrc +++ b/src/xschemrc @@ -159,6 +159,9 @@ #### this is the default: # set initial_geometry {900x600} +#### initial geometry of load /save / insert component file selector +# set file_dialog_default_geometry 800x600 + #### if set to 0, when zooming out allow the viewport do drift toward the mouse position, #### allowing to move away by zooming / unzooming with mouse wheel #### default setting: 0 diff --git a/xschem_library/ngspice/pv_ngspice.sch b/xschem_library/ngspice/pv_ngspice.sch index 616558db..702a1d14 100644 --- a/xschem_library/ngspice/pv_ngspice.sch +++ b/xschem_library/ngspice/pv_ngspice.sch @@ -114,11 +114,11 @@ lab=B} N 530 -670 530 -650 { lab=B} N 630 -600 630 -540 { -lab=#net1} +lab=im} N 630 -720 630 -660 { -lab=#net2} +lab=ip} N 100 -670 100 -650 { -lab=#net3} +lab=#net1} N 100 -570 590 -570 { lab=0} N 70 -570 100 -570 { @@ -132,13 +132,13 @@ lab=0} N 530 -590 530 -570 { lab=0} N 330 -670 330 -650 { -lab=#net4} +lab=#net2} N 330 -670 360 -670 { -lab=#net4} +lab=#net2} N 200 -670 270 -670 { lab=A} N 420 -670 430 -670 { -lab=#net5} +lab=#net3} N 520 -670 590 -670 { lab=B} N 490 -670 520 -670 { @@ -1143,3 +1143,5 @@ write pv_ngspice.raw quit .endc "} +C {lab_wire.sym} 630 -690 0 0 {name=p6 sig_type=std_logic lab=ip} +C {lab_wire.sym} 630 -560 0 0 {name=p7 sig_type=std_logic lab=im}